Fix CI scripts for proxied and exotic hosts#2383

craigcomstock merged 2 commits into

cfengine:mastercfengine/buildscripts:masterfrom

craigcomstock:ent-11241-4/mastercraigcomstock/buildscripts:ent-11241-4/masterCopy head branch name to clipboard