Merge proposals dependent on lp://qastaging/~niedbalski/charm-helpers/fix-1697002

lp://qastaging/~niedbalski/charm-helpers/fix-1697002 has no merge proposals.