When bootstrapping fails, jenv files are now cleaned up.

https://bugs.launchpad.net/juju-core/+bug/1361680
Good points. I've removed the logical-or from the conditional. Simply moving the defers before the prepare should do the trick.