Merge remote-tracking branch 'mconf/mconf'

...ain/java/name/fraser/neil/plaintext/diff_match_patch.java

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

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

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

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

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

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

...ton/core/pubsub/receivers/SharedNotesMessageReceiver.java

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

...ton/core/recorders/events/ClearPublicChatRecordEvent.java

...ton/core/recorders/events/GuestAskToEnterRecordEvent.java

...bigbluebutton/core/recorders/events/GuestPolicyEvent.java

...ebutton/core/recorders/events/ModeratorResponseEvent.java

...re/recorders/events/ParticipantRoleChangeRecordEvent.java

...utton/core/recorders/events/WaitingForModeratorEvent.java

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

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

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

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

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