Merge proposals dependent on lp://qastaging/~billy-olsen/charm-helpers/stable-backport-lp1398182

1. stable-backport-lp1398182
2. Dependent merge proposals