Merge pull request #4591 from commodo/ovs-upgrade-2-7-1