Merge branch '1.5.x'

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

@@ -180,13 +180,13 @@
   },
   {
     "name": "spring.profiles.active",
-    "type": "java.lang.String",
+    "type": "java.util.List<java.lang.String>",
     "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.include",
-    "type": "java.lang.String",
+    "type": "java.util.List<java.lang.String>",
     "sourceType": "org.springframework.boot.context.config.ConfigFileApplicationListener",
     "description": "Unconditionally activate the specified comma separated profiles."
   },