Merge proposals dependent on lp://qastaging/~ajkavanagh/charm-helpers/ppc64le_proposed_fix_plus_refactor

lp://qastaging/~ajkavanagh/charm-helpers/ppc64le_proposed_fix_plus_refactor has no merge proposals.