On the issue-3067-deleted-subtrees branch: Merge r33961-34008 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/issue-3067-deleted-subtrees@874084 13f79535-47bb-0310-9956-ffa450edef68