Merge branch '2.1.x' into 2.2.x

Author: philwebb

ci/parameters.yml

@@ -8,7 +8,6 @@ artifactory-server: "https://repo.spring.io"
 branch: "2.2.x"
 milestone: "2.2.x"
 build-name: "spring-boot"
-pipeline-name: "spring-boot-2.2.x"
 ci-image-name: "spring-boot-ci-22x"
 concourse-url: "https://ci.spring.io"
 bintray-subject: "spring"