refs #6153 fix address if no existing location type is set
Merge branch 'redistricting' into prod