fixed the height of the locale combobox
Merge branch 'merge-polling-with-master' of https://github.com/bigbluebutton/bigbluebutton into fix-whiteboard-toolbar-visibility