refs #6287 adjust how we fix this to be in sync with future core
refs #5920 adds some more error trapping
Merge branch 'redistricting' into prod