Correctly shutdown HierarchicalObjectStore and DistributedObjectStore
merge