Merge remote-tracking branch 'upstream/master' into issue-7850-2

.github/ISSUE_TEMPLATE/core-issue.md

.github/ISSUE_TEMPLATE/feature_request.md

.github/ISSUE_TEMPLATE/general-issue.md

.github/ISSUE_TEMPLATE/html5-issue.md

.github/ISSUE_TEMPLATE/installation-issue.md

.github/ISSUE_TEMPLATE/recording-issue.md

...s/src/main/scala/org/bigbluebutton/LockSettingsUtil.scala

...re/apps/users/ChangeLockSettingsInMeetingCmdMsgHdlr.scala

...ebutton/core/apps/users/LockUserInMeetingCmdMsgHdlr.scala

...on/core/apps/voice/UserTalkingInVoiceConfEvtMsgHdlr.scala

...in/scala/org/bigbluebutton/core/apps/voice/VoiceApp.scala

...ton/core/pubsub/senders/ReceivedJsonMsgHandlerActor.scala

bigbluebutton-config/bin/bbb-conf

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

...uebutton-html5/imports/api/audio/client/bridge/kurento.js

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

...-html5/imports/api/cursor/server/handlers/cursorUpdate.js

bigbluebutton-html5/imports/api/cursor/server/streamer.js

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

...pi/video-streams/server/handlers/userSharedHtml5Webcam.js