Merge branch '1.5.x'

Author: snicoll

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorAutoConfiguration.java

@@ -262,6 +262,7 @@ public HealthIndicator ldapHealthIndicator() {
 	}
 
 	@Configuration
+	@ConditionalOnClass(MongoTemplate.class)
 	@ConditionalOnBean(MongoTemplate.class)
 	@ConditionalOnEnabledHealthIndicator("mongo")
 	public static class MongoHealthIndicatorConfiguration extends

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/CacheAutoConfigurationTests.java

@@ -434,7 +434,7 @@ public void ehcache3AsJCacheWithConfig() throws IOException {
 	}
 
 	@Test
-	public void hazelcastCacheExplicit() { // Fail
+	public void hazelcastCacheExplicit() {
 		load(new Class[] { HazelcastAutoConfiguration.class,
 				DefaultCacheConfiguration.class }, "spring.cache.type=hazelcast");
 		HazelcastCacheManager cacheManager = validateCacheManager(