Merge "refactoring - return the same grains regardless of ceph version. add fsid"