Merge "Enable py3 tests" into feature/zuulv3