Merge changes from topic "tz_catchup2"

* changes:
  Add lookupTimeZoneIdsByCountry
  Make use of the default time zone for a country