Merge remote-tracking branch 'upstream/master' into Remove-finally

bbb-api-demo/src/main/webapp/demo_iframe.jsp

bigbluebutton-html5/imports/api/meetings/server/methods.js

...imports/api/meetings/server/methods/toggleLockSettings.js

.../meetings/server/methods/toggleWebcamsOnlyForModerator.js

...html5/imports/api/meetings/server/modifiers/addMeeting.js

...l5/imports/api/users/server/handlers/presenterAssigned.js

bigbluebutton-html5/imports/startup/server/logger.js

bigbluebutton-html5/imports/ui/components/app/component.jsx

bigbluebutton-html5/imports/ui/components/app/container.jsx

.../imports/ui/components/audio/audio-controls/container.jsx

...on-html5/imports/ui/components/error-screen/component.jsx

...on-html5/imports/ui/components/join-handler/component.jsx

...on-html5/imports/ui/components/lock-viewers/component.jsx

...on-html5/imports/ui/components/lock-viewers/container.jsx

...tton-html5/imports/ui/components/lock-viewers/styles.scss

...n-html5/imports/ui/components/meeting-ended/component.jsx

...ebutton-html5/imports/ui/components/user-list/styles.scss

...rts/ui/components/user-list/user-list-content/styles.scss

...er-list/user-list-content/user-participants/component.jsx

...list-content/user-participants/user-options/component.jsx