Relocate ConnectionResolver to DalResolver and support DataStore resolution