Merge branch '2.1.x'

Author: bclozel

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/embedded/JettyWebServerFactoryCustomizerTests.java

@@ -187,7 +187,7 @@ void customMaxHttpHeaderSizeIgnoredIfZero() {
 
 	@Test
 	void customIdleTimeout() {
-		bind("server.jetty.idle-timeout=60s");
+		bind("server.jetty.connection-idle-timeout=60s");
 		JettyWebServer server = customizeAndGetServer();
 		List<Long> timeouts = connectorsIdleTimeouts(server);
 		assertThat(timeouts).containsOnly(60000L);