Merge branch '1.2.x'

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

@@ -7,13 +7,13 @@
   },
   {
     "name": "endpoints.configprops.keys-to-sanitize",
-    "type": "java.lang.String",
+    "type": "java.lang.String[]",
     "sourceType": "org.springframework.boot.actuate.endpoint.ConfigurationPropertiesReportEndpoint",
     "description": "Keys that should be sanitized. Keys can be simple strings that the property ends with or regex expressions."
   },
   {
     "name": "endpoints.env.keys-to-sanitize",
-    "type": "java.lang.String",
+    "type": "java.lang.String[]",
     "sourceType": "org.springframework.boot.actuate.endpoint.EnvironmentEndpoint",
     "description": "Keys that should be sanitized. Keys can be simple strings that the property ends with or regex expressions."
   },