Charm Helpers

Merge proposals dependent on lp://qastaging/~james-page/charm-helpers/misc-https-fixes

  1. misc-https-fixes
  2. Dependent merge proposals

lp://qastaging/~james-page/charm-helpers/misc-https-fixes has no merge proposals.