On 1.8.x-r1584342 branch: merge r1581810 and 1584342, resolve text
conflicts for 1584342.


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