Merge proposals dependent on lp://staging/~lazypower/charm-helpers/revert-418

lp://staging/~lazypower/charm-helpers/revert-418 has no merge proposals.