Merge proposals dependent on lp://staging/~gnuoy/charm-helpers/enable-qos

lp://staging/~gnuoy/charm-helpers/enable-qos has no merge proposals.