Bug 871501 - Make zip file generation consistent r=vingetun a=leo+