Merge proposals dependent on lp:~tealeg/landscape-client/mocker-replace-test-fd

lp:~tealeg/landscape-client/mocker-replace-test-fd has no merge proposals.