On the fsfs-format7 branch: sync with trunk up to and inclduing r1489831.

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