Merge change 8377 into donut

* changes:
  Use Apache Commons Compress instead of java.util.zip