Merge proposals dependent on lp://qastaging/~adam-stokes/charm-helpers/trunk.py3-charm-helpers-sync

lp://qastaging/~adam-stokes/charm-helpers/trunk.py3-charm-helpers-sync has no merge proposals.