On issue-2897-take2:

Merge from ^/trunk revisions r35038 through r35201.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/issue-2897-take2@875276 13f79535-47bb-0310-9956-ffa450edef68