Minor additions to assist with newer ZFS versions
Merge branch 'master' of github.com:zfs-osx/spl