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

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