Merge branch '2.1.x' into 2.2.x

Closes gh-23375

Author: wilkinsona

spring-boot-project/spring-boot-dependencies/pom.xml

@@ -196,7 +196,7 @@
 		<spring-integration.version>5.2.8.RELEASE</spring-integration.version>
 		<spring-kafka.version>2.3.11.BUILD-SNAPSHOT</spring-kafka.version>
 		<spring-ldap.version>2.3.3.RELEASE</spring-ldap.version>
-		<spring-restdocs.version>2.0.4.RELEASE</spring-restdocs.version>
+		<spring-restdocs.version>2.0.5.RELEASE</spring-restdocs.version>
 		<spring-retry.version>1.2.5.RELEASE</spring-retry.version>
 		<spring-security.version>5.2.6.RELEASE</spring-security.version>
 		<spring-session-bom.version>Corn-BUILD-SNAPSHOT</spring-session-bom.version>