Merge proposals dependent on lp://qastaging/~tribaal/landscape-client/remove-mocker-test-updatemanager

lp://qastaging/~tribaal/landscape-client/remove-mocker-test-updatemanager has no merge proposals.