6795429 Virtually identical copies of iscsi_protocol.h live in two locations

6745433 Merge NWS consolidation into OS/Net consolidation