Merge "Rename work_dir/git to work_dir/src" into feature/zuulv3