=WIP
Merge branch 'machines-env-uuid' of github.com:mjs/juju into machines-env-uuid