2933 compiler warning gags need better granularity
Reviewed by: Eric Schrock <eric.schrock@delphix.com>
Approved by: Garrett D'Amore <garrett@damore.org>

6864230 hiho, hiho, it'ch chtime for CH to go
Portions contributed by Rich Lowe

6745433 Merge NWS consolidation into OS/Net consolidation