Merge branch '2.5.x' into 2.6.x

Closes gh-30087

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-profile/src/test/java/smoketest/profile/ActiveProfilesTests.java

@@ -33,7 +33,8 @@ import static org.assertj.core.api.Assertions.assertThat;
  *
  * @author Madhura Bhave
  */
-@SpringBootTest(webEnvironment = WebEnvironment.NONE, properties = "enableEnvironmentPostProcessor=true") // gh-28530
+@SpringBootTest(webEnvironment = WebEnvironment.NONE,
+		properties = { "enableEnvironmentPostProcessor=true", "server.port=0" }) // gh-28530
 @ActiveProfiles("hello")
 class ActiveProfilesTests {