Merge "Upgrade OVS dep for opflex from 2.6.7 to 2.12.0"