On 1.8.x-r1567286 branch: Merge r1567286 from trunk, fixing conflicts


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