Merge "UserRolesController methods up"