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
Reset United Kingdom country information to the corrected data, hide country code 'GB'
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.
changed country name to United Kingdom
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.
Hide legacy countries from lists
* Preserving country data for legacy country records
* Hidden by using a meta value attached to the country

*Also...*
Fixed return value format of countries array, function now used in admin screens
Merge remote-tracking branch 'upstream/master' into pr-121-uk-country-updates

Conflicts:
	wpsc-admin/db-upgrades/routines/11.php
Merge pull request #1192 from JeffPyeBrook/pr-121-uk-country-updates

Hide legacy countries from lists
Change legacy key
Fix issue that was false alarming a recursion condition in country class initialization
* Replaced missing code for tracking initializations in progress.  Not having the code was causing initialization recursion warning false alarms.
* Removed superfluous code that was checking for, and forcing the premature,  initialization of country data maps.

*Also...*
* Make sure country being updated exists in upgrade routine
* Fix some typos in variable names
* Aligned some assignment statements
* Code from WPSC_Country class that was directly accessing database now part of the WPSC_Countries class.  All direct access to countries data is now in the WPSC_Countries service class.  All the code that accesses the database for countries is together.
Fix UK admin notice typo.  Also, fix wpdb::prepare() notices.
Merge pull request #1196 from JeffPyeBrook/pr-121-uk-country-updates

Fix issue that was false alarming a recursion condition in country class initialization
Set legacy flag on TP, YU and AN country codes
Merge pull request #1198 from JeffPyeBrook/pr-121-uk-country-updates

Set legacy flag on TP, YU and AN country codes
Clean up 11.php routine.
Merge remote-tracking branch 'upstream/master'