Merge remote-tracking branch 'upstream/master' into config-organization

akka-bbb-apps/scala/JsonTest.sc

...n/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java

...luebutton/core/pubsub/receivers/UsersMessageReceiver.java

...ain/scala/org/bigbluebutton/core/BigBlueButtonActor.scala

...main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala

...scala/org/bigbluebutton/core/JsonMessageSenderActor.scala

...s/src/main/scala/org/bigbluebutton/core/LiveMeeting.scala

.../src/main/scala/org/bigbluebutton/core/MeetingActor.scala

.../src/main/scala/org/bigbluebutton/core/MeetingModel.scala

...ain/scala/org/bigbluebutton/core/MessageSenderActor.scala

...rc/main/scala/org/bigbluebutton/core/api/InMessages.scala

...c/main/scala/org/bigbluebutton/core/api/OutMessages.scala

...n/scala/org/bigbluebutton/core/apps/BreakoutRoomApp.scala

...scala/org/bigbluebutton/core/apps/BreakoutRoomModel.scala

...n/core/pubsub/senders/MeetingMessageToJsonConverter.scala

.../test/scala/org/bigbluebutton/core/AppsTestFixtures.scala

akka-bbb-fsesl/fs_conf_files/conf/dialplan/default.xml

akka-bbb-fsesl/fs_conf_files/conf/dialplan/public.xml

...ebutton/freeswitch/voice/freeswitch/ESLEventListener.java

...org/bigbluebutton/freeswitch/VoiceConferenceService.scala