Merge proposals dependent on lp:~niemeyer/juju-core/simplify-sample-charms

lp:~niemeyer/juju-core/simplify-sample-charms has no merge proposals.