Merged changes from trunk into 2.2.x branch.

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