Merge "Remove test_job_inheritance" into feature/zuulv3