Merge proposals dependent on lp://staging/~mskalka/juju-ci-tools/remove-constraints-from-bootstrap

1. remove-constraints-from-bootstrap
2. Dependent merge proposals