Merge r1641564 and drop change to externals_tests.py as the modified test is not on the branch. git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x-r1641564@1641578 13f79535-47bb-0310-9956-ffa450edef68