Merge "allow pci null for op_port_mapping to be used as external port for SDN-assist"