Merge remote branch 'upstream/master' into fix-the-tooltips

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

.../bigbluebutton/webconference/voice/ConferenceService.java

...va/org/bigbluebutton/webconference/voice/Participant.java

...main/java/org/bigbluebutton/webconference/voice/Room.java

...uebutton/webconference/voice/internal/ParticipantImp.java

...g/bigbluebutton/webconference/voice/internal/RoomImp.java

...gbluebutton/webconference/voice/internal/RoomManager.java

bigbluebutton-client/build.xml

bigbluebutton-client/resources/prod/3rd-party.html

bigbluebutton-client/resources/prod/lib/3rd-party.js

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

bigbluebutton-client/src/WebcamPreviewStandalone.mxml

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

...client/src/org/bigbluebutton/main/api/ExternalApiCalls.as

...igbluebutton/modules/users/business/ListenersSOService.as

...g/bigbluebutton/modules/videoconf/views/AvatarWindow.mxml

...bigbluebutton/modules/videoconf/views/ControlButtons.mxml

.../bigbluebutton/modules/videoconf/views/PublishWindow.mxml

...rg/bigbluebutton/modules/videoconf/views/VideoWindow.mxml

bigbluebutton-config/web/css/style.css