Merge "Fix github driver tests for py3" into feature/zuulv3