On the multiple moves branch:
In preparation for merging with trunk, bring up to date with trunk at 22750.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/multiple-moves@862825 13f79535-47bb-0310-9956-ffa450edef68