Fix regressions in Contributor matching and ContributorAccount matching
Fix regressions in Contributor matching and ContributorAccount matching

benmishkanian/ASF-JIRA-mine,benmishkanian/ASF-JIRA-mine,benmishkanian/ASF-JIRA-mine