Merge "Move test_model.test_job_inheritance_configloader" into feature/zuulv3