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

Conflicts:
	upgrades/steps121_test.go