Merge "Fix traceback when evaluating github changes" into feature/zuulv3