Merge "base64 changes for py3" into feature/zuulv3