On the reintegrate-improvements branch: Merge r34059-34089 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/reintegrate-improvements@874164 13f79535-47bb-0310-9956-ffa450edef68