Remove common dependencies on Datastore and Harvest

[dafeder]

Once #4360 and #4359 are complete, let's try to remove these dependencies and see where failures happen, attempt to remediate. Hopefully will not require making any breaking changes to fix. The goal is we should be able to build a catalog with datastore or harvest disabled, run the tests without them unless they're needed.