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
In local environments, by default, don't run OS updates/upgrades.
Merge branch 'master' of https://github.com/juju/juju
Merge branch 'master' of github.com:katco-/juju into local-apt-defaults
Updated tests to reflect behavior when updates are off.
Merge pull request #621 from katco-/local-apt-defaults

Local apt defaults

For @howbazaar to correct local environment update/upgrade behavior when bootstrapping.

Running all tests locally now. I won't land unless they pass on my machine, but I wanted to get this up for review.