Fixing NPE in during client pool shutdown
Refactoring RESTClientFactory and R2Store to accept a D2 client
Naming convention cleanup of R2Store