am d74be2a9: Merge change 8377 into donut

Merge commit 'd74be2a969207c7f3ea91962bf3720d198f7fbc5'

* commit 'd74be2a969207c7f3ea91962bf3720d198f7fbc5':
  Use Apache Commons Compress instead of java.util.zip