Storm

Merge proposals dependent on lp://staging/~marienz/storm/recover-from-failed-flush

  1. recover-from-failed-flush
  2. Dependent merge proposals

lp://staging/~marienz/storm/recover-from-failed-flush has no merge proposals.