Merge branch '3.2.x' into 3.3.x

Author: ryanjbaxter

scripts/deploy.sh

@@ -2,6 +2,3 @@
 set -e
 
 ./mvnw deploy -DskipTests -B -Pfast,deploy ${@}
-./mvnw dockerfile:push -pl :spring-cloud-kubernetes-configuration-watcher -Pdockerpush ${@}
-./mvnw dockerfile:push -pl :spring-cloud-kubernetes-discoveryserver -Pdockerpush ${@}
-./mvnw dockerfile:push -pl :spring-cloud-kubernetes-configserver -Pdockerpush ${@}