Merge remote-tracking branch 'upstream/bbb-2x-mconf' into html5-2x-captions-messages

akka-bbb-apps/build.sbt

akka-bbb-apps/project/plugins.sbt

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

...bluebutton/core/pubsub/receivers/ChatMessageReceiver.java

...ton/core/pubsub/receivers/ConversionUpdatesProcessor.java

...utton/core/pubsub/receivers/DeskShareMessageReceiver.java

...bluebutton/core/pubsub/receivers/LockMessageReceiver.java

...ebutton/core/pubsub/receivers/MeetingMessageReceiver.java

...ebutton/core/pubsub/receivers/PollingMessageReceiver.java

...on/core/pubsub/receivers/PresentationMessageListener.java

...button/core/pubsub/receivers/PreuploadedPresentation.java

...luebutton/core/pubsub/receivers/RedisMessageReceiver.java

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

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

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

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

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

...ain/scala/org/bigbluebutton/core/JsonMessageDecoder.scala

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

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