Merge branch 'ovs-vport-cleanup'