On the 1.8.x-r1477876 branch: merge r1477876 from trunk, resolving conflicts.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x-r1477876@1478010 13f79535-47bb-0310-9956-ffa450edef68
On the 1.8.x-r1477876 branch: merge r1477891,1478001 from trunk.

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