[bootstrap] Restores some of the previous hack to get builds going; Simplify hack

6 jobs for issue-44-licence-location in 27 minutes and 24 seconds (queued for 1 second)
Status Name Job ID Coverage
  Build
passed build_linux_36 #181052
docker

00:03:42

passed build_linux_37 #181053
docker

00:03:34

canceled build_macosx_36 #181061
macosx

00:23:32

canceled build_macosx_37 #181060
macosx

00:23:42

failed build_macosx_36 #181054
macosx

00:15:46

failed build_macosx_37 #181055
macosx

00:15:46