Merge branch '1.4.x' into 1.5.x

spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/orm/jpa/TestDatabaseAutoConfigurationNoEmbeddedTests.java

@@ -75,8 +75,8 @@ public class TestDatabaseAutoConfigurationNoEmbeddedTests {
 	public void applyNoReplace() {
 		load(ExistingDataSourceConfiguration.class, "spring.test.database.replace=NONE");
 		assertThat(this.context.getBeansOfType(DataSource.class)).hasSize(1);
-		assertThat(this.context.getBean(DataSource.class)).isSameAs(
+		assertThat(this.context.getBean(DataSource.class))
-				this.context.getBean("myCustomDataSource"));
+				.isSameAs(this.context.getBean("myCustomDataSource"));
 	}
 
 	public void load(Class<?> config, String... environment) {