CONN-400: Fix for not supporting country code.
Merge pull request #473 from msweaver/CONN-400

CONN-400: Fix for not supporting country code.