Merge "Migration: handle shared queues" into feature/zuulv3