Merge "Remove test_git_cache_dir" into feature/zuulv3