Merging several changes from trunk to the 2.4.x branch.

git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/branches/2.4.x@1592626 13f79535-47bb-0310-9956-ffa450edef68