Merged updates to enable/disable webrtc; removed obsolete references to asterisk
Merge branch 'merge-polling-with-master' of https://github.com/bigbluebutton/bigbluebutton into merge-polling-with-master