Sync the 'issue-4194-dev' branch with recent trunk changes.
(Merged /subversion/trunk:r1414432-1414811.)

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/issue-4194-dev@1414814 13f79535-47bb-0310-9956-ffa450edef68