Merge country/overseas territory

These were merged to become world location and the changes were pulled
in by an earlier rebase. This commit accounts for that.