Merge "Fix py3 issue with command module" into feature/zuulv3