Merging 678603 from trunk.


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