Merge branch '4.0.x' into 4.1.x

Closes gh-51087

module/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/RestartScopeInitializer.java

@@ -47,7 +47,7 @@ public class RestartScopeInitializer implements ApplicationContextInitializer<Co
 		}
 
 		@Override
-		public Object remove(String name) {
+		public @Nullable Object remove(String name) {
 			return Restarter.getInstance().removeAttribute(name);
 		}
 

module/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/Restarter.java

@@ -450,7 +450,7 @@ public class Restarter {
 		return value;
 	}
 
-	public Object removeAttribute(String name) {
+	public @Nullable Object removeAttribute(String name) {
 		return this.attributes.remove(name);
 	}