Attempt to pull in IllumOS #4873 as we will not get it via ZOL.
Silence the warnings we know about until upstream does something
Merge branch 'master' of github.com:openzfsonosx/zfs
Merge branch 'illumos-4873-lundman'