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

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