Merge proposals dependent on lp://staging/~zulcss/charm-helpers/fix-typo

lp://staging/~zulcss/charm-helpers/fix-typo has no merge proposals.