Merge remote-tracking branch 'upstream/master' into settings_msg

...button/freeswitch/voice/freeswitch/ConnectionManager.java

...on/freeswitch/voice/freeswitch/FreeswitchApplication.java

...oice/freeswitch/actions/TransferUserToMeetingCommand.java

akka-bbb-fsesl/src/main/resources/application.conf

akka-bbb-fsesl/src/main/scala/org/bigbluebutton/Boot.scala

...rc/main/scala/org/bigbluebutton/SystemConfiguration.scala

bigbluebutton-html5/imports/ui/components/app/service.js

...luebutton-html5/imports/ui/components/modal/component.jsx