Merge remote-tracking branch 'upstream/bbb-2x-mconf' into cleanup-old-1.1-apps

...ain/scala/org/bigbluebutton/core/BigBlueButtonActor.scala

...main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala

.../src/main/scala/org/bigbluebutton/core/MeetingModel.scala

...rc/main/scala/org/bigbluebutton/core/api/InMessages.scala

...rc/main/scala/org/bigbluebutton/core/apps/GuestsApp.scala

.../scala/org/bigbluebutton/core/apps/ScreenshareModel.scala

...sentation/PresentationConversionCompletedPubMsgHdlr.scala

...presentation/PresentationConversionUpdatePubMsgHdlr.scala

...ps/presentation/PresentationPageGeneratedPubMsgHdlr.scala

...ore/apps/screenshare/GetScreenshareStatusReqMsgHdlr.scala

...igbluebutton/core/apps/screenshare/ScreenshareApp2x.scala

.../ScreenshareRtmpBroadcastStartedVoiceConfEvtMsgHdlr.scala

...luebutton/core/apps/users/ChangeUserEmojiCmdMsgHdlr.scala

...luebutton/core/apps/users/GetUsersMeetingReqMsgHdlr.scala

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

...utton/core/apps/users/LogoutAndEndMeetingCmdMsgHdlr.scala

...n/core/apps/users/MeetingActivityResponseCmdMsgHdlr.scala

...rg/bigbluebutton/core/apps/users/MuteUserCmdMsgHdlr.scala

...igbluebutton/core/apps/users/RegisterUserReqMsgHdlr.scala

...button/core/apps/users/UserBroadcastCamStartMsgHdlr.scala