Merge proposals dependent on lp://qastaging/~danilo/landscape-client/mock-tests-broker-exchange

1. mock-tests-broker-exchange
2. Dependent merge proposals