Merge branch '2.3.x' into 2.4.x

Closes gh-25727

Author: wilkinsona

ci/pipeline.yml

@@ -82,7 +82,7 @@ resource_types:
   type: registry-image
   source:
     repository: springio/artifactory-resource
-    tag: 0.0.13
+    tag: 0.0.14
 - name: pull-request
   type: registry-image
   source: