Patch 3324815 - Fix incorrect zip archive behavior. This also fixes a few of our unit tests.
Patch 3324815 - Fix incorrect zip archive behavior. This also fixes a few of our unit tests.

vbudovski/ogre,vbudovski/ogre,vbudovski/ogre,vbudovski/ogre,vbudovski/ogre