Merge remote-tracking branch 'remotes/from/ce/release/1.21.x' into release/1.21.x

Author: hc-github-team-secure-vault-core

ui/package.json

@@ -169,11 +169,12 @@
   "resolutions": {
     "ansi-html": "0.0.8",
     "async": "2.6.4",
-    "body-parser": "1.20.3",
+    "express": "4.22.1",
     "braces": "3.0.3",
     "eslint-utils": "1.4.3",
     "https-proxy-agent": "2.2.4",
     "ini": "1.3.8",
+    "qs": "6.14.1",
     "kind-of": "6.0.3",
     "micromatch": "4.0.8",
     "prismjs": "1.30.0",