Merge pull request #4332 from commodo/ovs-upgrade