Merge "Re-enable test_zuul_trigger_project_change_merged" into feature/zuulv3