Merge branch '3.4.x' into 3.5.x

Closes gh-47914

Author: snicoll

antora/package-lock.json

@@ -4,7 +4,7 @@
     "postinstall": "patch-package"
   },
   "dependencies": {
-    "@antora/cli": "3.2.0-alpha.4",
+    "@antora/cli": "3.2.0-alpha.10",
     "@antora/site-generator": "3.2.0-alpha.4",
     "@antora/atlas-extension": "1.0.0-alpha.2",
     "@springio/antora-extensions": "1.14.7",