Merge proposals dependent on lp://staging/~laney/dbus-test-runner/sync-archive-fix-test-deps

1. sync-archive-fix-test-deps
2. Dependent merge proposals