Merge branch '1.4.x' into 1.5.x

Author: snicoll

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

@@ -73,10 +73,10 @@ private void customize(CacheManager cacheManager, CacheManagerCustomizer customi
 			customizer.customize(cacheManager);
 		}
 		catch (ClassCastException ex) {
-			// Possibly a lambda-defined listener which we could not resolve the generic
+			// Possibly a lambda-defined customizer which we could not resolve the generic
 			// event type for
 			if (logger.isDebugEnabled()) {
-				logger.debug("Non-matching transaction manager type for customizer: "
+				logger.debug("Non-matching cache manager type for customizer: "
 						+ customizer, ex);
 			}
 		}