Merge "Add MANAGE_ROLE_HOLDERS permission to shell."