Merge "Stop supporting python2" into feature/zuulv3