On 1.8.x-r1578853 branch, merge r1578853 and r1578875 and resolve text conflict.


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