On 1.7.x-r1236343 branch. Merge 1179776, 1222628, 1222644, 1222699, 1236283, 1236343 from trunk and resolve conflicts in 1236343. git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x-r1236343@1236630 13f79535-47bb-0310-9956-ffa450edef68