Merge "Clean up obsolete TODO for _setGitSsh()" into feature/zuulv3