Merge proposals dependent on lp://qastaging/~simpoir/landscape-client/mocker_to_mock_test_registration

lp://qastaging/~simpoir/landscape-client/mocker_to_mock_test_registration has no merge proposals.