Merge proposals dependent on lp://qastaging/~shaner/charm-helpers/lp1712203

lp://qastaging/~shaner/charm-helpers/lp1712203 has no merge proposals.