Merge branch '3.4.x' into 3.5.x

Closes gh-46257

Author: wilkinsona

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/SpringApplicationTests.java

@@ -168,6 +168,7 @@
  * @author Tadaya Tsuyukubo
  * @author Yanming Zhou
  * @author Sijun Yang
+ * @author Giheon Do
  */
 @ExtendWith(OutputCaptureExtension.class)
 class SpringApplicationTests {
@@ -1470,7 +1471,7 @@ void fromRunsWithAdditionalSources() {
 			.run()
 			.getApplicationContext();
 		assertThat(ExampleAdditionalConfig.local.get()).isNotNull();
-		ExampleAdditionalConfig.local.set(null);
+		ExampleAdditionalConfig.local.remove();
 	}
 
 	@Test