3488061 cleanup for illumos build
32 files changed