svn rev 1231711 and 1231715 are based on Sebastian Krueger patches
svn rev 1231711 and 1231715 are based on Sebastian Krueger patches


git-svn-id: bddd0b838a5b7898c5897d85c562f956f46262e5@1231716 13f79535-47bb-0310-9956-ffa450edef68

pantsbuild/ivy,pantsbuild/ivy