Merge r1567985 from /trunk and resolve a trival text conflict.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x-r1567985@1568018 13f79535-47bb-0310-9956-ffa450edef68