Fixed build host setup chicken/egg logic#2013

craigcomstock merged 2 commits into

cfengine:mastercfengine/buildscripts:masterfrom

craigcomstock:ent-13016-egg-fixcraigcomstock/buildscripts:ent-13016-egg-fixCopy head branch name to clipboard