refs #5920 cleanup addresses with multiple same location types
Merge branch 'redistricting' of github.com:nysenate/Bluebird-CRM into redistricting