Drizzle

Merge proposals dependent on lp://qastaging/~brianaker/drizzle/fix-non-repeat-tests

  1. fix-non-repeat-tests
  2. Dependent merge proposals

lp://qastaging/~brianaker/drizzle/fix-non-repeat-tests has no merge proposals.