Updating user account identities to be unique to both UserID and OrgID

UserID is not guaranteed to be unique across orgs.  Most commonly, user IDs will be duplicated when a production org is cloned to sandbox for testing.

This makes user account uniqueness criteria based on both UserID and OrgID.