After a large amount of YAK shaving, finally rebased the ConcurretnZipCreator back
to trunk