Merge "Drop local fork of GitPython for 2.1.8 release" into feature/zuulv3