sync with trunk (one last time?)

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/compress/branches/zip64@1152552 13f79535-47bb-0310-9956-ffa450edef68