Sync FSX with FSFS.  Block r1636644 as it already coveres FSX.

* subversion/libsvn_fs_x
  (): Update mergeinfo.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1645591 13f79535-47bb-0310-9956-ffa450edef68