am ccf9c1da: Merge change 7479 into donut

Merge commit 'ccf9c1da8612d2d9bfb13efb97ceed29c15c83b4'

* commit 'ccf9c1da8612d2d9bfb13efb97ceed29c15c83b4':
  handle identical gzip chunks better