Merge "Remove irrelevant test_merging_queues" into feature/zuulv3