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

1. remove-mocker-apt-preferences
2. Dependent merge proposals