Merge branch 'use-generated-userid' into merge-master-with-use-generated-userid

...rg/bigbluebutton/conference/BigBlueButtonApplication.java

.../conference/service/participants/ParticipantsHandler.java

...tton/conference/service/whiteboard/WhiteboardService.java

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

...ient/src/org/bigbluebutton/main/model/users/Conference.as

...ent/src/org/bigbluebutton/main/model/users/JoinService.as

...g/bigbluebutton/main/model/users/NetConnectionDelegate.as

...ent/src/org/bigbluebutton/main/model/users/UserService.as

.../src/org/bigbluebutton/main/model/users/UsersSOService.as

...rs/org/bigbluebutton/web/controllers/ApiController.groovy