Merge "Encoding changes in tests for py3" into feature/zuulv3