Merge pull request #17108 from commodo/ovs-no-python-six