Revert "Bug 1032391 - update zip and unzip on mac os x build/test machines to 6.0, r=dustin"
Merge default -> production