On the 1.8.x-r1560723-and-friends branch:
Merge r1560723,1561419,1561427,1561428 from /trunk,
resolve conflicts and adapt code where necessary.


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