Merge "BUG-5006: rework tests using AbstractDataBrokerTest"