Wip 7698

Rebased on master.  Some "const" changes in tools/ceph_filestore_dump.cc merge conflicts were resolved.