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.
Merge pull request #1196 from JeffPyeBrook/pr-121-uk-country-updates

Fix issue that was false alarming a recursion condition in country class initialization