Merge branch '2.3.x'

Closes gh-22928

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

@@ -48,10 +48,6 @@
       "name": "server.error.include-stacktrace",
       "defaultValue": "never"
     },
-    {
-      "name": "server.forward-headers-strategy",
-      "defaultValue": "ncsa"
-    },
     {
       "name": "server.http2.enabled",
       "description": "Whether to enable HTTP/2 support, if the current environment supports it.",
@@ -71,6 +67,10 @@
         "level": "error"
       }
     },
+    {
+      "name": "server.jetty.accesslog.format",
+      "defaultValue": "ncsa"
+    },
     {
       "name": "server.jetty.accesslog.locale",
       "deprecation": {