Merge branch '3.2.x' into 3.3.x

Closes gh-41585

Author: wilkinsona

spring-boot-project/spring-boot-docs/src/docs/antora/modules/reference/pages/features/external-config.adoc

@@ -770,6 +770,8 @@ NOTE: The use of `java.util.Optional` with `@ConfigurationProperties` is not rec
 As such, it is not well-suited to configuration property injection.
 For consistency with properties of other types, if you do declare an `Optional` property and it has no value, `null` rather than an empty `Optional` will be bound.
 
+TIP: To use a reserved keyword in the name of a property, such as `my.service.import`, use the `@Name` annotation on the constructor parameter.
+
 
 
 [[features.external-config.typesafe-configuration-properties.enabling-annotated-types]]