Drizzle

Merge proposals dependent on lp://qastaging/~clint-fewbar/drizzle/fix-user-option

  1. fix-user-option
  2. Dependent merge proposals

lp://qastaging/~clint-fewbar/drizzle/fix-user-option has no merge proposals.