More fixes in the zoneparser for unhandled XML files.
Merge branch 'test' into dev