On the fsfs-improvements branch: Sync with /trunk up to r1517472.
No conflicts.

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