Merge "Clean up the zipfile creation in InstallTest"