Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into pods_vol4

bbb-apps-common/build.sbt

...in/scala/org/bigbluebutton/client/meeting/UserActor.scala

...in/java/org/bigbluebutton/app/video/VideoApplication.java

...rc/main/java/org/bigbluebutton/app/video/VideoStream.java

...java/org/bigbluebutton/app/video/VideoStreamListener.java

bigbluebutton-apps/build.gradle

bigbluebutton-client/resources/prod/layout.xml