javadoc update
Merge remote-tracking branch 'upstream/develop' into develop
[CON-69] refactor read & write locks in AccessTokenManager + update return statement in getting new uid