Sync csr1kv_openvswitch plugin with openvswitch plugin. Note: NOT debugged yet

Change-Id: I0dcee7ffc98b9dfb32f4238264fe8e930593122b