Cherry pick pull request #243 from buildkite/bootstrap-script-fetch-logic
Cherry pick pull request #243 from buildkite/bootstrap-script-fetch-logic

Bootstrap script fetch logic tweaks

Shopify/agent,buildkite/agent,buildkite/agent,Shopify/agent,buildkite/agent,Shopify/agent