Make ARM work with non-public cloud

[paulmey]

Public cloud is hardcoded for ARM, so it won't work on US Gov, China, or other non-public clouds.