Create a backport branch for issue #4411 fixes.
This merges r1513479 and r1625522 from trunk, resolving conflicts.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x-issue4411@1655044 13f79535-47bb-0310-9956-ffa450edef68
2 files changed