Merged some changes for the 2.1.0 release from trunk into 2.1.x branch

git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/branches/2.1.x@816393 13f79535-47bb-0310-9956-ffa450edef68
4 files changed