B-58092 moving DatastoreService back to core-lib, refactoring to support this