Merge branch 'cmn/zlib-update' into cmn/update-zlib
zlib: add a few missing defines
zlib: get rid of gz*
zlib: get rid of compress.c