On 1.6.x-r1443929 branch: merge r1443929 from trunk and resolve conflicts.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x-r1443929@1443954 13f79535-47bb-0310-9956-ffa450edef68