Merge proposals dependent on lp://qastaging/~adam-collard/landscape-client/drop-mocker

lp://qastaging/~adam-collard/landscape-client/drop-mocker has no merge proposals.