When bootstrapping fails, jenv files are now cleaned up.
Modified function definitions. Removed conditional on err.
Merge pull request #669 from katco-/lp-1361680-ignore-env-if-jenv

When bootstrapping fails, jenv files are now cleaned up.

https://bugs.launchpad.net/juju-core/+bug/1361680