Bug-5523 RoleManager changes