On the fsfs-improvements branch: sync with trunk up to and including r1546835. There were no conflicts. git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/fsfs-improvements@1546837 13f79535-47bb-0310-9956-ffa450edef68