OVS dp is back

Depends on: 
https://review.openstack.org/59692
https://review.openstack.org/59693

Needs to be cherry-picked to the master.