fixes #6224 add some address deduping when location type conflict
Merge branch 'redistricting' of github.com:nysenate/Bluebird-CRM into redistricting
Merge branch 'redistricting' into prod