Merge "skip py3 failing tests" into feature/zuulv3