Merge branch '1.4.x' into 1.5.x

Author: snicoll

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/JCacheCacheConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

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

@@ -669,7 +669,7 @@ public void infinispanAsJCacheWithConfig() throws IOException {
 	}
 
 	@Test
-	public void jCacheCacheWithCachesAndCustomizer() { // this one
+	public void jCacheCacheWithCachesAndCustomizer() {
 		String cachingProviderFqn = HazelcastCachingProvider.class.getName();
 		try {
 			load(JCacheWithCustomizerConfiguration.class, "spring.cache.type=jcache",