On the fsfs-format7 branch: Plug a whole at the beginning of our
merge info from /trunk. --record-only merge of r1414755:1414757.

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