Merged r1540044, r1540417 from trunk and resolved tree conflict
caused by refactoring on trunk.

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