Merge proposals dependent on lp://qastaging/~adam-collard/landscape-client/mocker-replace-watchdog-run-tests

lp://qastaging/~adam-collard/landscape-client/mocker-replace-watchdog-run-tests has no merge proposals.