U1DB

Merge proposals dependent on lp://qastaging/~thisfred/u1db/remove-local-gen-before-sync

  1. remove-local-gen-before-sync
  2. Dependent merge proposals

lp://qastaging/~thisfred/u1db/remove-local-gen-before-sync has no merge proposals.