Merge proposals dependent on lp:juju-core/docs

lp:juju-core/docs has no merge proposals.