Merge remote-tracking branch 'upstream/develop' into all-in-one-autotest

bigbluebutton-html5/imports/startup/client/base.jsx

...-html5/imports/ui/components/activity-check/component.jsx

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

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

...ton-html5/imports/ui/components/video-provider/service.js