Merge branch '2.1.x' into 2.2.x

Closes spring-projectsgh-19032

Author: snicoll

spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-configuration-metadata.adoc

@@ -752,12 +752,12 @@ Consider the following class:
 
 [source,java,indent=0,subs="verbatim,quotes,attributes"]
 ----
-	@ConfigurationProperties(prefix="acme.messaging")
+	@ConfigurationProperties(prefix = "acme.messaging")
 	public class MessagingProperties {
 
-		private List<String> addresses = new ArrayList<>(Arrays.asList("a", "b")) ;
+		private List<String> addresses = new ArrayList<>(Arrays.asList("a", "b"));
 
-		private ContainerType = ContainerType.SIMPLE;
+		private ContainerType containerType = ContainerType.SIMPLE;
 
 		// ... getter and setters