5121 dscfglockd is needless wsdiff noise Reviewed by: Josef 'Jeff' Sipek <josef.sipek@nexenta.com> Approved by: Robert Mustacchi <rm@joyent.com>
6893174 avs and other sources are not ss12u1 lint clean
6745433 Merge NWS consolidation into OS/Net consolidation