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

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