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

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