Tested that the original country ID is being kept
Moved location upgrade logic to CMService_MaxMind

- Made CM_Location_Cli to a mere wrapper
- Adjusted tests