On the fs-rep-sharing branch:
For the final time: bring up-to-date with trunk.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/fs-rep-sharing@873803 13f79535-47bb-0310-9956-ffa450edef68