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

bigbluebutton-html5/imports/api/audio/client/bridge/sip.js

bigbluebutton-html5/imports/api/captions/server/helpers.js

...n-html5/imports/api/captions/server/methods/appendText.js

...ml5/imports/api/captions/server/methods/createCaptions.js

...imports/api/captions/server/methods/fetchReadOnlyPadId.js

bigbluebutton-html5/imports/api/common/server/etherpad.js

bigbluebutton-html5/imports/api/common/server/helpers.js

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

bigbluebutton-html5/imports/api/note/server/helpers.js

...utton-html5/imports/api/note/server/methods/createNote.js

...luebutton-html5/imports/ui/components/captions/service.js