copy of batch-countrystatecounty for 4.3
Store and reinstate valid state/county when copying
Merge pull request #399 from agh1/batch-countrystatecounty-4.3

copy of batch-countrystatecounty for 4.3