Merge branch '5.8.x' into 6.1.x

Closes gh-15037

scripts/release/release-notes-sections.yml

@@ -11,9 +11,11 @@ changelog:
       labels: ["type: bug"]
       sort: "title"
     - title: ":hammer: Dependency Upgrades"
-      emoji: ":hammer:"
       labels: ["type: dependency-upgrade"]
       sort: "title"
+    - title: ":nut_and_bolt: Build Updates"
+      labels: ["type: task", "in: build"]
+      sort: "title"
   issues:
     exclude:
       labels: ["status: duplicate"]