Merge branch '2.2.x' into 2.3.x

Closes gh-22711

Author: wilkinsona

ci/pipeline.yml

@@ -52,7 +52,7 @@ anchors:
         "zip.deployed": "false"
   slack-fail-params: &slack-fail-params
     text: >
-      :concourse-failed: <https://ci.spring.io/teams/${BUILD_TEAM_NAME}/pipelines/${BUILD_PIPELINE_NAME}/jobs/${BUILD_JOB_NAME}/builds/${BUILD_NAME}|${BUILD_PIPELINE_NAME} ${BUILD_JOB_NAME} failed!>
+      @here :concourse-failed: <https://ci.spring.io/teams/${BUILD_TEAM_NAME}/pipelines/${BUILD_PIPELINE_NAME}/jobs/${BUILD_JOB_NAME}/builds/${BUILD_NAME}|${BUILD_PIPELINE_NAME} ${BUILD_JOB_NAME} failed!>
       [$TEXT_FILE_CONTENT]
     text_file: git-repo/build/build-scan-uri.txt
     silent: true