Merge "Fix Bug #1088 Zipping packages using osm repo-index" into v7.0