Merge remote-tracking branch 'upstream/master' into cursorTrack

...s/src/main/scala/org/bigbluebutton/core/LiveMeeting.scala

bigbluebutton-client/resources/prod/lib/bbb_api_bridge.js

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

bigbluebutton-client/src/org/bigbluebutton/core/TimerUtil.as

...nt/src/org/bigbluebutton/main/api/ExternalApiCallbacks.as

...gbluebutton/modules/users/views/BreakoutRoomSettings.mxml

...rc/org/bigbluebutton/modules/users/views/UsersWindow.mxml