Merge branch '2.4.x' into 2.5.x

Closes gh-26870

spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/tunnel/server/SocketTargetServerConnectionTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2021 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.
@@ -37,7 +37,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
  */
 class SocketTargetServerConnectionTests {
 
-	private static final int DEFAULT_TIMEOUT = 1000;
+	private static final int DEFAULT_TIMEOUT = 5000;
 
 	private MockServer server;