Merge branch '1.2.x'

# Conflicts:
#	spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/websocket/WebSocketAutoConfiguration.java

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/websocket/WebSocketAutoConfiguration.java

@@ -24,6 +24,7 @@ import org.eclipse.jetty.websocket.jsr356.server.deploy.WebSocketServerContainer
 
 import org.springframework.boot.autoconfigure.AutoConfigureBefore;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnJava;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
 import org.springframework.boot.autoconfigure.web.EmbeddedServletContainerAutoConfiguration;
@@ -62,6 +63,7 @@ public class WebSocketAutoConfiguration {
 
 		@Bean
 		@ConditionalOnMissingBean(name = "websocketContainerCustomizer")
+		@ConditionalOnJava(ConditionalOnJava.JavaVersion.SEVEN)
 		public TomcatWebSocketContainerCustomizer websocketContainerCustomizer() {
 			return new TomcatWebSocketContainerCustomizer();
 		}