fixes #6313 prevent two open case activities
fixes #6309 do not migrate privacy options
Merge branch 'redistricting' into prod