Merge "Fix project/domain scope in dynamic_creds"