Merge branch 'master' into wip/hc/zfs-fbsd-vfs

Conflicts:
	sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c