Merge proposals dependent on lp:~abentley/charmworld/use-latest-charm

lp:~abentley/charmworld/use-latest-charm has no merge proposals.