Merge proposals dependent on lp://qastaging/~zulcss/charm-helpers/charm-fixes

lp://qastaging/~zulcss/charm-helpers/charm-fixes has no merge proposals.