Merge changes from topic "tz_catchup1"

* changes:
  Track changes to the tzlookup.xml format
  Add support for an IANA version in tzlookup.xml