juju/juju — pull request #350 by katco- (2014-07-21 14:49:00+00:00)
Title: Backport: Bootstrap no longer cleans up if it can't tell whether an environment is bootstrapped or not.

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

Conflicts:
cmd/juju/bootstrap.go
cmd/juju/synctools.go