fixes #7496 export household merge state
Merge branch 'dev' of github.com:nysenate/Bluebird-CRM into dev