OVS dp is back

Depends on: TBA
Needs to be cherry-picked to the master.