Merge "Make test_dynamic_dependent_pipeline_failure more robust" into feature/zuulv3