Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into fix-6963

bigbluebutton-html5/imports/ui/components/media/styles.scss

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

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

bigbluebutton-html5/imports/ui/components/poll/styles.scss

.../components/presentation/presentation-uploader/service.js

bigbluebutton-html5/private/locales/en.json