On the 1.8.x-busted-proxy branch: Perform a catchup-merge from the 1.8.x branch. (ensured clean merge, and reduces overall diff) git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x-busted-proxy@1502106 13f79535-47bb-0310-9956-ffa450edef68