Allow the same chars for datastore names as CDTDatastore

Allow the same chars for datastore names as CDTDatastore
URLEncode db names for use with the filesystem
Remove this import