Merge "Upgrade commons-compress v1.18"