Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into remove-logs

bigbluebutton-client/resources/config.xml.template

bigbluebutton-client/resources/prod/lib/kurento-extension.js

bigbluebutton-client/resources/prod/lib/kurento-utils.js

bigbluebutton-config/web/index.html

...luebutton-html5/client/compatibility/kurento-extension.js

bigbluebutton-html5/client/compatibility/kurento-utils.js

...n-html5/imports/ui/components/video-preview/component.jsx

bigbluebutton-html5/private/config/settings.yml