Merge branch '4.1.x'

Closes gh-51160

Author: snicoll

module/spring-boot-groovy-templates/src/test/java/org/springframework/boot/groovy/template/autoconfigure/GroovyTemplateAutoConfigurationTests.java

@@ -70,9 +70,7 @@ void setupContext() {
 	@AfterEach
 	void close() {
 		LocaleContextHolder.resetLocaleContext();
-		if (this.context != null) {
-			this.context.close();
-		}
+		this.context.close();
 	}
 
 	@Test