Merge "Fix some issues in ovsdpdk, cni for ovsdpdk"