CSPACE-6337: Reflect CSPACE-6168 changes to instance qualify database users and database names. Note: this change is still untested.