Merge branch '1.5.x' into 2.0.x

Author: snicoll

spring-boot-project/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc

@@ -1230,7 +1230,7 @@ Maven, you would add the following dependency:
 	<dependency>
 		<groupId>org.jolokia</groupId>
 		<artifactId>jolokia-core</artifactId>
- 	</dependency>
+	</dependency>
 ----
 
 The Jolokia endpoint can then be exposed by adding `jolokia` or `*` to the