Drizzle

Merge proposals dependent on lp://qastaging/~stewart/drizzle/bug682006-unlock-no-tables-error

  1. bug682006-unlock-no-tables-error
  2. Dependent merge proposals

lp://qastaging/~stewart/drizzle/bug682006-unlock-no-tables-error has no merge proposals.