Country database update should allow update only by ID or ISO code. 'code' value should be disallowed because it is not unique to any single country
Merge pull request #1191 from JeffPyeBrook/pr-1190-dont-update-country-by-code

Country database update should allow update only by ID or ISO code.
Merge pull request #1189 from JeffPyeBrook/pr-121-uk-country-updates

Reset United Kingdom country information to the corrected data, hide country code 'GB'
Fix weird indentation on prior PR merge.
Merge remote-tracking branch 'upstream/master' into pr-121-uk-country-updates

Conflicts:
	wpsc-admin/db-upgrades/routines/11.php