Merge proposals dependent on lp://staging/~nshepperd/apt-sync/add-tests

lp://staging/~nshepperd/apt-sync/add-tests has no merge proposals.