On the 1.8.x-busted-proxy branch:

Merge (cleanly) r1489117, r1496470, r1497975, r1497980, r1498012.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x-busted-proxy@1499223 13f79535-47bb-0310-9956-ffa450edef68
6 files changed