Merge "Move test_repo_deleted to simple_layout" into feature/zuulv3