i - fix issue where user cannot leave voice conference when clicking on headset icon
Merge branch 'merge-polling-with-master' of github.com:bigbluebutton/bigbluebutton into merge-polling-with-master