Charm Helpers

Merge proposals dependent on lp://staging/~chris.macnaughton/charm-helpers/fix-lint-in-new-test

  1. fix-lint-in-new-test
  2. Dependent merge proposals

lp://staging/~chris.macnaughton/charm-helpers/fix-lint-in-new-test has no merge proposals.