Charm Helpers

Merge proposals dependent on lp://qastaging/~fnordahl/charm-helpers/bug-1651989

  1. bug-1651989
  2. Dependent merge proposals

lp://qastaging/~fnordahl/charm-helpers/bug-1651989 has no merge proposals.