Merge handling of duplicate entries from Commons Compress' ZipFile - needed to fix PR 54967

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@1489286 13f79535-47bb-0310-9956-ffa450edef68