Merge branch '2.3.x' into 2.4.x

Closes gh-26653

Author: snicoll

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

@@ -848,6 +848,12 @@
       "sourceType": "org.springframework.boot.context.config.ConfigFileApplicationListener",
       "description": "Comma-separated list of active profiles. Can be overridden by a command line switch."
     },
+    {
+      "name": "spring.profiles.default",
+      "type": "java.lang.String",
+      "description": "Name of the profile to enable if no profile is active.",
+      "defaultValue": "default"
+    },
     {
       "name": "spring.profiles.include",
       "type": "java.util.List<java.lang.String>",