refs #5920 migration tweaks
Merge branch 'redistricting' of github.com:nysenate/Bluebird-CRM into redistricting