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

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