Fixed bug when buffer size for zip files is -1 and could not be extracted.

See ZipArchiveInputStream javadoc:
  Note that {@link ZipArchiveEntry#getSize()} may return -1 if the
  DEFLATE algorithm is used, as the size information is not available
  from the header.
merged zipfix branch and fixed merge conflicts.