Merge proposals dependent on lp://staging/~ted/dbus-test-runner/conf-file-move

lp://staging/~ted/dbus-test-runner/conf-file-move has no merge proposals.