Merge proposals dependent on lp://qastaging/~gandelman-a/charm-helpers/unison

lp://qastaging/~gandelman-a/charm-helpers/unison has no merge proposals.