Merge branch '1.4.x' into 1.5.x

spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc

@@ -2716,6 +2716,7 @@ advanced examples, typically to take full control over the configuration of the
 DataSource.
 
 
+
 [[boot-features-embedded-database-support]]
 ==== Embedded Database Support
 It's often convenient to develop applications using an in-memory embedded database.

spring-boot-docs/src/main/asciidoc/using-spring-boot.adoc

@@ -782,7 +782,7 @@ will cache compiled templates to avoid repeatedly parsing template files.
 Also, Spring MVC can add HTTP caching headers to responses when serving static resources.
 
 Whilst caching is very beneficial in production, it can be counter productive during
-development, preventing you from seeing the changes you just made in your application. 
+development, preventing you from seeing the changes you just made in your application.
 For this reason, spring-boot-devtools will disable those caching options by default.
 
 Cache options are usually configured by settings in your `application.properties` file.

spring-boot-docs/src/main/java/org/springframework/boot/web/client/RestTemplateProxyCustomizationExample.java

@@ -64,4 +64,5 @@ public class RestTemplateProxyCustomizationExample {
 
 	}
 	// end::customizer[]
+
 }