Reworking of UserManager and UserRoleManager
Signed-off-by:Craig West <craigrwest@googlemail.com>