Merge branch '2.3.x' into 2.4.x

See gh-25481

spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/src/test/java/org/springframework/boot/context/embedded/AbstractApplicationLauncher.java

@@ -64,6 +64,12 @@ abstract class AbstractApplicationLauncher implements BeforeEachCallback {
 	void destroyProcess() {
 		if (this.process != null) {
 			this.process.destroy();
+			try {
+				this.process.waitFor();
+			}
+			catch (InterruptedException ex) {
+				Thread.currentThread().interrupt();
+			}
 		}
 	}