Merge proposals dependent on lp://staging/~benji/charmworld/add-lp-branch

lp://staging/~benji/charmworld/add-lp-branch has no merge proposals.