Merge proposals dependent on lp://staging/~veebers/juju-ci-tools/model-migration-using-simple-resource-http

1. model-migration-using-simple-resource-http
2. Dependent merge proposals