Charm Helpers

Merge proposals dependent on lp://qastaging/~1chb1n/charm-helpers/amulet-file-race

  1. amulet-file-race
  2. Dependent merge proposals

lp://qastaging/~1chb1n/charm-helpers/amulet-file-race has no merge proposals.