Merge "py3 Changes in __del__ for gitpython" into feature/zuulv3