Merge "Extract AlwaysValidRoleValidator from RoleValidator"