Merge branch '3.0.x' into 3.1.x

Closes gh-38178

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatWebServer.java

@@ -134,7 +134,7 @@ public class TomcatWebServer implements WebServer {
 
 				// Unlike Jetty, all Tomcat threads are daemon threads. We create a
 				// blocking non-daemon to stop immediate shutdown
-				startDaemonAwaitThread();
+				startNonDaemonAwaitThread();
 			}
 			catch (Exception ex) {
 				stopSilently();
@@ -189,7 +189,7 @@ public class TomcatWebServer implements WebServer {
 		}
 	}
 
-	private void startDaemonAwaitThread() {
+	private void startNonDaemonAwaitThread() {
 		Thread awaitThread = new Thread("container-" + (containerCounter.get())) {
 
 			@Override