CSPACE-6337: Additional variable name changes, etc., to reflect CSPACE-6168 changes to instance qualify database users and database names.