Merge branch 'MDL-64506' of git://github.com/Chocolate-lightning/moodle

diff --cc config-dist.php
Simple merge

diff --cc lang/en/admin.php
Simple merge

diff --cc lib/moodlelib.php
Simple merge

diff --cc message/templates/message_drawer_view_conversation_header_content_type_private.mustache
Simple merge

diff --cc message/templates/message_drawer_view_conversation_header_content_type_public.mustache
Simple merge

diff --cc message/templates/message_popover.mustache
index 7e1c75a,09c1748..e314506
--- 1/message/templates/message_popover.mustache
--- 2/message/templates/message_popover.mustache
+++ b/message/templates/message_popover.mustache
@@@ -35,9 -35,8 +35,9 @@@
      }
  
  }}
- <div class="pull-right popover-region collapsed">
+ <div class="float-right popover-region collapsed">
 -    <a id="message-drawer-toggle-{{uniqid}}" class="nav-link d-inline-block popover-region-toggle position-relative" href="#">
 +    <a id="message-drawer-toggle-{{uniqid}}" class="nav-link d-inline-block popover-region-toggle position-relative" href="#"
 +            role="button">
          {{#pix}} t/message, core, {{#str}} togglemessagemenu, message {{/str}} {{/pix}}
          <div class="count-container {{^unreadcount}}hidden{{/unreadcount}}" data-region="count-container">{{unreadcount}}</div>
      </a>