Merge "fix tox python3 overrides"