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

...ton/core/recorders/events/ParticipantJoinRecordEvent.java

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

...uebutton-client/branding/default/style/css/BBBDefault.css

bigbluebutton-client/locale/en_US/bbbResources.properties

...gbluebutton/modules/users/views/BreakoutRoomSettings.mxml

...rc/org/bigbluebutton/modules/users/views/UsersWindow.mxml