Merge "Add option to use netdev datapath_type"