Fix merge conflict

bigbluebutton-config/bin/bbb-conf

bigbluebutton-config/bin/bbb-record

bigbluebutton-config/cron.daily/bigbluebutton

.../imports/ui/components/audio/audio-controls/component.jsx

...button-html5/imports/ui/components/dropdown/component.jsx

...ml5/imports/ui/components/fullscreen-button/container.jsx

...ton-html5/imports/ui/components/muted-alert/component.jsx

...rts/ui/components/nav-bar/settings-dropdown/container.jsx

bigbluebutton-html5/private/config/settings.yml

...uebutton-web/grails-app/conf/spring/turn-stun-servers.xml