Merge branch 'master' of https://github.com/juju/juju into migrate-status-constraints-annotations

Conflicts:
	state/megawatcher.go