Bug 871501 - Make zip file generation consistent
Merge pull request #10406 from michaelwu/bug-871501

Bug 871501 - Make zip file generation consistent