Supporting on-premises data gateways in non-default environments

We recently added support for on-premises data gateways in non-default environments.