fixes #6224 ensure we dont overwrite addresses of same location type
Merge branch 'redistricting' of github.com:nysenate/Bluebird-CRM into redistricting