Merge proposals dependent on lp://qastaging/~gnuoy/charm-helpers/stable-1453940

lp://qastaging/~gnuoy/charm-helpers/stable-1453940 has no merge proposals.