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