Merge "Package zips if no tar.gz available"