[illumos-gate merge]

commit 69962b5647e4a8b9b14998733b765925381b727e
    4045 zfs write throttle & i/o scheduler performance work
commit 7e0e2549bfaa531aff576083ab0c07f84fa8fb27
    3845 beadm doesn't work in non-global zones
commit dc986d9f4cb40f3ff88fe0d9c9fb3a51ad50f0d9
    4054 dis sometimes decides random symbols are functions
commit edd4ab01432cfb07428329ad6e8071e8923d0b20
    3194 dis crashes disassembling aes

Conflicts:
	usr/src/uts/common/fs/zfs/vdev_queue.c
	usr/src/uts/common/fs/zfs/sys/zio.h
	usr/src/uts/common/fs/zfs/sys/vdev_impl.h
	usr/src/uts/common/fs/zfs/sys/dsl_dir.h
	usr/src/uts/common/fs/zfs/dsl_pool.c
	usr/src/uts/common/fs/zfs/arc.c
	usr/src/lib/libbe/common/be_list.c