Merge r1588778 from trunk, resolving conflicts.

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