Merge "Remove tox locale overrides"