On the fsx-id branch:
Switch another cache-layer internal API away from svn_fs_t.

* subversion/libsvn_fs_x/cached_data.h
  (svn_fs_x__get_mergeinfo_count): Switch the ID type.

* subversion/libsvn_fs_x/cached_data.c
  (svn_fs_x__get_mergeinfo_count): Update implementation.

* subversion/libsvn_fs_x/tree.c
  (verify_node): Update caller.

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