Merge branch '2.1.x' into 2.2.x

Closes gh-19187

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-test/src/test/java/smoketest/test/web/UserVehicleControllerTests.java

@@ -91,7 +91,7 @@ class UserVehicleControllerTests {
 	}
 
 	@Test
-	void welcomeCommandLineRunnerShouldBeAvailable() {
+	void welcomeCommandLineRunnerShouldNotBeAvailable() {
 		// Since we're a @WebMvcTest WelcomeCommandLineRunner should not be available.
 		Assertions.assertThatThrownBy(() -> this.applicationContext.getBean(WelcomeCommandLineRunner.class))
 				.isInstanceOf(NoSuchBeanDefinitionException.class);