Merge "misc py3 changes" into feature/zuulv3