Merge branch 'master' of https://github.com/juju/juju
Revert "Revert "Merge pull request #530 from ericsnowcurrently/backups-storage""

This reverts commit 68c71ec48f16eac6f8aff2a66496afb148ec95c6.
state: NetworkInterfaces type uses Tags

Return the correctly typed name.Tag implementation from NetworkInterfaces methods.
Merge branch 'master' of https://github.com/juju/juju
Merge pull request #611 from ericsnowcurrently/backups-storage

Un-revert PR #530

This reverts commit 68c71ec48f16eac6f8aff2a66496afb148ec95c6.  It simply re-applies a93e1df919450377b6dab707552582fd604cd8cf.
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.
Merge pull request #614 from davecheney/186-state-networkinterfaces-tags

state: NetworkInterfaces type uses Tags

Return the correctly typed name.Tag implementation from NetworkInterfaces methods.