Perform country lookups by iso code - works better with OpenStreetMaps API.

(cherry picked from commit e93400b9dadf0134c269dc16bc866e331cd72626)