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

1. remove-mocker-network-devices
2. Dependent merge proposals