Applying patch to override domain_id on auth and fix for token rescoping.