Merge branch '2.2.x' into 2.3.x

Author: philwebb

ci/parameters.yml

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

ci/pipeline.yml

@@ -364,7 +364,7 @@ jobs:
       params: { state: "pending", commit: "git-repo" }
     - do:
       - task: build-project
-        image: spring-boot-jdk15-ci-image
+        image: ci-image-jdk15
         <<: *build-project-task-params
       on_failure:
         do: