Merge pull request #5399 from NeoRaider/openvswitch-no-sphinx