Clean up the umount procedure, allowing for umount to work again.
Manual umount followed by export works, but export on its own does not.
This is a problem with userland mnttab wrappers somewhere.

Remove source dirt
Remove source dirt

Merge branch 'master' of github.com:zfs-osx/zfs

Conflicts:
	module/zfs/zfs_vnops.c