Merge "Remove use of six library" into feature/zuulv3