Merge branch '2.3.x' into 2.4.x

Closes gh-25357

Author: wilkinsona

ci/tasks/generate-changelog.yml

@@ -4,7 +4,7 @@ image_resource:
   type: registry-image
   source:
     repository: springio/github-changelog-generator
-    tag: '0.0.5'
+    tag: '0.0.6'
 inputs:
 - name: git-repo
 - name: artifactory-repo