update country.patch

these chunks are applied upstream
Merge pull request #497 from lslezak/country_patch_update

update country.patch - do not merge yet