Merge "Remove old tox jobs" into feature/zuulv3