On fsfs-lock-many branch: sync with trunk at r1576815.

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