Merge branch '2.1.x' into 2.2.x

Closes gh-21097

spring-boot-project/spring-boot-devtools/src/main/resources/META-INF/additional-spring-configuration-metadata.json

 {
   "properties": [
+    {
+      "name": "spring.devtools.add-properties",
+      "type": "java.lang.Boolean",
+      "description": "Whether to enable development property defaults.",
+      "defaultValue": true
+    },
     {
       "name": "spring.devtools.remote.debug.enabled",
       "type": "java.lang.Boolean",
@@ -19,12 +25,6 @@
         "reason": "Remote debug is no longer supported.",
         "level": "error"
       }
-    },
-    {
-      "name": "spring.devtools.add-properties",
-      "type": "java.lang.Boolean",
-      "description": "Whether to enable development property defaults.",
-      "defaultValue": true
     }
   ]
 }