Merge branch '2.5.x'

Closes gh-27773

Author: wilkinsona

ci/pipeline.yml

@@ -691,8 +691,9 @@ jobs:
       trigger: true
       passed: [promote-release]
       params:
-        download_artifacts: false
+        download_artifacts: true
         save_build_info: true
+        threads: 8
     - task: publish-gradle-plugin
       image: ci-image
       file: git-repo/ci/tasks/publish-gradle-plugin.yml