On fsfs-lock-many branch: a corrupt working copy with svn:mergeinfo
missing from 'notes/' meant that the sync merges from trunk (r1576824,
r1573603 and r1572541) did not get recorded on 'notes/' on the branch.

* notes: Subtree merge to fix svn:mergeinfo, no other changes.


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