Merge "Fix race in TestDuplicatePipeline test" into feature/zuulv3