Merge proposals dependent on lp://staging/~doanac/ubuntu-ci-services-itself/data-store-consistency

1. data-store-consistency
2. Dependent merge proposals