Merge branch '2.7.x' into 3.0.x

Closes gh-37252

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

@@ -1599,6 +1599,13 @@
         "level": "error"
       }
     },
+    {
+      "name": "management.metrics.export.signalfx.published-histogram-type",
+      "deprecation": {
+        "level": "error",
+        "replacement": "management.signalfx.metrics.export.published-histogram-type"
+      }
+    },
     {
       "name": "management.metrics.export.signalfx.read-timeout",
       "type": "java.time.Duration",
@@ -2132,6 +2139,10 @@
       "name": "management.server.ssl.trust-store-type",
       "description": "Type of the trust store."
     },
+    {
+      "name": "management.signalfx.metrics.export.published-histogram-type",
+      "defaultValue": "default"
+    },
     {
       "name": "management.simple.metrics.export.mode",
       "defaultValue": "cumulative"