Merge branch 'v3.12.x' into mergify/bp/v3.12.x/pr-8241

Author: michaelklishin

deps/rabbit/src/rabbit_looking_glass.erl

@@ -61,7 +61,7 @@ trace(Input) ->
             )).
 
 trace_qq() ->
-    dbg:stop_clear(),
+    dbg:stop(),
     lg:trace([ra_server,
               ra_server_proc,
               rabbit_fifo,

deps/rabbitmq_management/priv/www/js/tmpl/policies.ejs

@@ -292,6 +292,9 @@
                 <td>Queues [Classic]</td>
                 <td>
                   <span class="argument-link" field="definitionop" key="expires" type="number">Auto expire</span>
+                  <span class="argument-link" field="definitionop" key="ha-mode" type="string">HA mode</span> <span class="help" id="policy-ha-mode"></span> |
+                  <span class="argument-link" field="definitionop" key="ha-params" type="number">HA params</span> <span class="help" id="policy-ha-params"></span> |
+                  <span class="argument-link" field="definitionop" key="ha-sync-mode" type="string">HA sync mode</span> <span class="help" id="policy-ha-sync-mode"></span> </br>
                 </td>
               </tr>
               <tr>