Broadened validation rules for new EntrustRoles.