On the log-addressing branch: sync with the parent branch fsfs-improvements.
There were two minor conficts.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/log-addressing@1545958 13f79535-47bb-0310-9956-ffa450edef68