fixes #6649 exclude contacts with user account from trashing
Merge branch 'redistricting' of github.com:nysenate/Bluebird-CRM into redistricting