Merge remote-tracking branch 'ritzalam/fix-lock-settings' into investigate-locking-more

...src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala

...bigbluebutton/red5/client/MeetingClientMessageSender.java

bigbluebutton-client/resources/config.xml.template

bigbluebutton-client/src/org/bigbluebutton/common/LogUtil.as

...-client/src/org/bigbluebutton/main/model/users/BBBUser.as

...g/bigbluebutton/modules/users/services/MessageReceiver.as

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

...ent/src/org/bigbluebutton/util/logging/ServerLogTarget.as