Merge remote branch 'upstream/master' into fix-video-dock

...rg/bigbluebutton/conference/BigBlueButtonApplication.java

...va/org/bigbluebutton/conference/BigBlueButtonSession.java

.../conference/service/participants/ParticipantsHandler.java

.../bigbluebutton/conference/service/voice/VoiceHandler.java

...g/bigbluebutton/main/model/users/NetConnectionDelegate.as

...c/org/bigbluebutton/main/views/CameraDisplaySettings.mxml

.../bigbluebutton/modules/users/views/MediaItemRenderer.mxml

...rg/bigbluebutton/modules/videoconf/business/VideoProxy.as