Lots of changes in cc_of_lib/utilities/netsvcs files
Resolved Makefile conflict