On the 1.7.x-r1564215 branch: Merge r1564215 from trunk and
resolve the text conflicts.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x-r1564215@1564362 13f79535-47bb-0310-9956-ffa450edef68