Merge proposals dependent on lp://qastaging/~rbalint/update-manager/retry-after-failed-transaction

1. retry-after-failed-transaction
2. Dependent merge proposals