Merge commit 'refs/top-bases/fix-list' into fix-list

Conflicts:

	module/zfs/zil.c

diff --cc module/zfs/arc.c
Simple merge

diff --cc module/zfs/dbuf.c
Simple merge

diff --cc module/zfs/dsl_dataset.c
Simple merge

diff --cc module/zfs/include/sys/dbuf.h
Simple merge

diff --cc module/zfs/vdev.c
Simple merge