Merge branch '1.4.x' into 1.5.x

spring-boot-test/src/test/java/org/springframework/boot/test/context/ConfigFileApplicationContextInitializerTests.java

@@ -50,4 +50,5 @@ public class ConfigFileApplicationContextInitializerTests {
 	public static class Config {
 
 	}
+
 }

spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanWithAsyncInterfaceMethodIntegrationTests.java

@@ -78,6 +78,7 @@ public class MockBeanWithAsyncInterfaceMethodIntegrationTests {
 		public MyService myService(Transformer transformer) {
 			return new MyService(transformer);
 		}
+
 	}
 
 }

spring-boot-test/src/test/java/org/springframework/boot/test/web/client/TestRestTemplateTests.java

@@ -201,4 +201,5 @@ public class TestRestTemplateTests {
 				.isEqualTo(password);
 
 	}
+
 }