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

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