Merge branch '2.1.x'

Closes gh-18588

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

@@ -665,6 +665,13 @@
       "description": "Whether initialization should be performed lazily.",
       "defaultValue": false
     },
+    {
+      "name": "spring.main.register-shutdown-hook",
+      "type": "java.lang.Boolean",
+      "sourceType": "org.springframework.boot.SpringApplication",
+      "description": "Whether the application should have a shutdown hook registered.",
+      "defaultValue": true
+    },
     {
       "name": "spring.main.show-banner",
       "type": "java.lang.Boolean",