Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into 08-26-merge

bigbluebutton-html5/imports/api/annotations/addAnnotation.js

...orts/api/users-settings/server/methods/addUserSettings.js

...tton-html5/imports/ui/components/captions/pad/styles.scss

...l5/imports/ui/components/chat/chat-dropdown/component.jsx

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

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

...mponents/external-video-player/custom-players/panopto.jsx

...luebutton-html5/imports/ui/components/media/container.jsx

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

...on-html5/imports/ui/components/presentation/component.jsx

...r-participants/user-list-item/user-dropdown/component.jsx

...n-html5/imports/ui/components/video-preview/component.jsx

...-html5/imports/ui/components/video-provider/component.jsx

...-html5/imports/ui/components/video-provider/container.jsx

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

...rts/ui/components/video-provider/video-list/component.jsx

...rts/ui/components/video-provider/video-list/container.jsx

...ports/ui/components/video-provider/video-list/styles.scss

...s/video-provider/video-list/video-list-item/component.jsx

bigbluebutton-html5/private/config/settings.yml