Merge branch '1.4.x' into 1.5.x

spring-boot/src/main/java/org/springframework/boot/jdbc/DatabaseDriver.java

@@ -107,7 +107,7 @@ public enum DatabaseDriver {
 	/**
 	 * SQL Server.
 	 */
-	SQLSERVER("SQL SERVER", "com.microsoft.sqlserver.jdbc.SQLServerDriver",
+	SQLSERVER("Microsoft SQL Server", "com.microsoft.sqlserver.jdbc.SQLServerDriver",
 			"com.microsoft.sqlserver.jdbc.SQLServerXADataSource", "SELECT 1"),
 
 	/**

spring-boot/src/test/java/org/springframework/boot/jdbc/DatabaseDriverTests.java

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -84,7 +84,7 @@ public class DatabaseDriverTests {
 				.isEqualTo(DatabaseDriver.ORACLE);
 		assertThat(DatabaseDriver.fromProductName("PostgreSQL"))
 				.isEqualTo(DatabaseDriver.POSTGRESQL);
-		assertThat(DatabaseDriver.fromProductName("SQL SERVER"))
+		assertThat(DatabaseDriver.fromProductName("Microsoft SQL Server"))
 				.isEqualTo(DatabaseDriver.SQLSERVER);
 		assertThat(DatabaseDriver.fromProductName("DB2")).isEqualTo(DatabaseDriver.DB2);
 		assertThat(DatabaseDriver.fromProductName("Firebird 2.5.WI"))