Merge branch 'master' of https://github.com/juju/juju
Merge branch 'master' of https://github.com/juju/juju
Merge branch 'master' of https://github.com/juju/juju
Fix wrench build on Windows
Merge branch 'master' of https://github.com/juju/juju
KVM containers can now be created using a user-provided SimpleStreams URL as a base.
Bootstrap Endpoint Address

After Bootstrap returns successfully, get the bootstrap instance and
write its addresses to jenv/environ info/connection info.
Apt-get upgrades are now optional.
Merge branch 'master' of https://github.com/juju/juju into endpoint-on-bootstrap-take3

Conflicts:
	cmd/envcmd/environmentcommand.go
	cmd/juju/bootstrap_test.go
Corrections from round #1 of reviews.
Corrections from round 2 of reviews.
Fixed nil-reference panic.
fix formatting error in test
Generate CA Certificates that are valid for a bit further back in time.

See bug #1352944. We were generating certificates that were valid 5 minutes ago, to avoid
problems with the clock on the client being out of sync with the clock on the server, but
it seems 5 minutes isn't quite enough to account for real world clock skew. So bump it
up to 1 week.
add some comments about what we are testing.

Also, do the same work for Server and Client certs as well as the CA cert.
Modified test to reflect new default of preferring updates/upgrades.
Merge branch 'master' of https://github.com/juju/juju
Merge pull request #597 from davecheney/state-fix-logf-in-tests

fix formatting error in test

What it says on the tin.
Merge pull request #584 from katco-/lp-1322302-local-slow-transition-part-2

Configurable apt-get behavior.

For:
https://bugs.launchpad.net/juju-core/+bug/1322302
https://bugs.launchpad.net/juju-core/+bug/1350493
Introduce environs/bootstrap.BootstrapParams

The user-facing Bootstrap method (i.e. as
used by cmd/juju) will take different parameters
than the provider-specific one (Environ.Bootstrap).
Thus, we introduce a new parameter struct that is
currently identical to environs.BootstrapParams,
but will be changing imminently.