Merge remote-tracking branch 'upstream/master' into issue-5846

...button-client/resources/prod/lib/bbb_webrtc_bridge_sip.js

bigbluebutton-client/resources/prod/lib/kurento-extension.js

bigbluebutton-client/resources/prod/lib/kurento-utils.js

...utton-html5/client/compatibility/bbb_webrtc_bridge_sip.js

...luebutton-html5/client/compatibility/kurento-extension.js

bigbluebutton-html5/client/compatibility/kurento-utils.js

bigbluebutton-html5/imports/api/audio/client/bridge/sip.js

bigbluebutton-html5/imports/api/external-videos/index.js

...orts/api/users-settings/server/methods/addUserSettings.js

...luebutton-html5/imports/api/users/server/eventHandlers.js

bigbluebutton-html5/imports/api/users/server/methods.js

...-html5/imports/api/users/server/methods/toggleUserLock.js

bigbluebutton-html5/imports/startup/client/intl.jsx

.../ui/components/actions-bar/actions-dropdown/component.jsx

...ton-html5/imports/ui/components/actions-bar/component.jsx

...ton-html5/imports/ui/components/actions-bar/container.jsx

...components/actions-bar/create-breakout-room/component.jsx

...components/actions-bar/presentation-options/component.jsx

...utton-html5/imports/ui/components/actions-bar/styles.scss

bigbluebutton-html5/imports/ui/components/app/component.jsx