Merge branch 'master' of https://github.com/juju/juju into migrate-charms

Conflicts:
	state/upgrades.go
	state/upgrades_test.go