Merge branch '5.8.x' into 6.0.x

Closes gh-13293

Author: rwinch

docs/modules/ROOT/pages/servlet/integrations/websocket.adoc

@@ -72,8 +72,8 @@ A comparable XML based configuration looks like the following:
 ====
 [source,xml]
 ----
-<websocket-message-broker use-authorization-manager="true">
-    <intercept-message pattern="/user/**" access="authenticated"/>
+<websocket-message-broker use-authorization-manager="true"> <!--1--> <!--2-->
+    <intercept-message pattern="/user/**" access="authenticated"/> <!--3-->
 </websocket-message-broker>
 ----
 ====