On the 1.8.x-r1579588 branch: Do a catchup merge from 1.8.x to resolve conflicts caused by merge of 1.8.x-r1584342 branch.


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