backport IVY-404 and IVY-415 fixes

git-svn-id: https://svn.apache.org/repos/asf/incubator/ivy/core/branches/1.4.x@515516 13f79535-47bb-0310-9956-ffa450edef68
6 files changed