merge changes from 1.8.4

git-svn-id: https://svn.apache.org/repos/asf/ant/core/branches/ANT_18_BRANCH@1341315 13f79535-47bb-0310-9956-ffa450edef68
3 files changed