Bug 871501 - Make zip file generation consistent