When bootstrapping fails, jenv files are now cleaned up.

https://bugs.launchpad.net/juju-core/+bug/1361680
Also corrected, thanks.