Merge branch 'openvswitch-remove-a-couple-of-BUG_ON'