On the fsfs-format7 branch: Manually sync with fsfs-improvements
(i.e. this is not a merge).  Things will probably not compile.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/fsfs-format7@1506992 13f79535-47bb-0310-9956-ffa450edef68