5062 bootadm update-archive should not fail if grub1 is missing
Reviewed by: Gary Mills <gary_mills@fastmail.fm>
Reviewed by: Igor Kozhukhov <ikozhukhov@gmail.com>
Approved by: Richard Lowe <richlowe@richlowe.net>
5136 fix write throttle comment in dsl_pool.c
Reviewed by: Adam Leventhal <ahl@delphix.com>
Reviewed by: Christopher Siden <christopher.siden@delphix.com>
Reviewed by: Max Grossman <max.grossman@delphix.com>
Reviewed by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
Reviewed by: Richard Elling <richard.elling@gmail.com>
Approved by: Dan McDonald <danmcd@omniti.com>
5138 add tunable for maximum number of blocks freed in one txg
Reviewed by: Adam Leventhal <adam.leventhal@delphix.com>
Reviewed by: Mattew Ahrens <mahrens@delphix.com>
Reviewed by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
Reviewed by: Richard Elling <richard.elling@gmail.com>
Reviewed by: George Wilson <george.wilson@delphix.com>
Approved by: Dan McDonald <danmcd@omniti.com>
5134 if ZFS_DEBUG or debug= is set, libzpool should enable debug prints
Reviewed by: Adam Leventhal <adam.leventhal@delphix.com>
Reviewed by: Christopher Siden <christopher.siden@delphix.com>
Reviewed by: George Wilson <george.wilson@delphix.com>
Reviewed by: Saso Kiselkov <skiselkov.ml@gmail.com>
Approved by: Dan McDonald <danmcd@omniti.com>
5140 message about "%recv could not be opened" is printed when booting after crash
Reviewed by: Christopher Siden <christopher.siden@delphix.com>
Reviewed by: George Wilson <george.wilson@delphix.com>
Reviewed by: Max Grossman <max.grossman@delphix.com>
Reviewed by: Richard Elling <richard.elling@gmail.com>
Approved by: Dan McDonald <danmcd@omniti.com>
5139 SEEK_HOLE failed to report a hole at end of file
Reviewed by: Adam Leventhal <adam.leventhal@delphix.com>
Reviewed by: Alex Reece <alex.reece@delphix.com>
Reviewed by: Christopher Siden <christopher.siden@delphix.com>
Reviewed by: George Wilson <george.wilson@delphix.com>
Reviewed by: Max Grossman <max.grossman@delphix.com>
Reviewed by: Peng Dai <peng.dai@delphix.com>
Reviewed by: Richard Elling <richard.elling@gmail.com>
Approved by: Dan McDonald <danmcd@omniti.com>
	[illumos-gate merge]

commit 0fbc0cd0e52a11f6c4397a1714f94412cbf98b60
    5139 SEEK_HOLE failed to report a hole at end of file
commit 22438533bcc131ecebd4c16c699c35e91d321b76
    5140 message about "%recv could not be opened" is printed when booting after crash
commit 7fa49ea5e7d23077615525b1738f90f273258b05
    5134 if ZFS_DEBUG or debug= is set, libzpool should enable debug prints
commit af3465da8fa420c4ec701e3e57704d537a6f755b
    5138 add tunable for maximum number of blocks freed in one txg
commit d85a1e969ce08b3bc4a7cb3626a6e33a28b5caeb
    5136 fix write throttle comment in dsl_pool.c
commit 630270564f9cfe09ebbccb748c7dc1d897e14135
    5062 bootadm update-archive should not fail if grub1 is missing

Conflicts:
	usr/src/uts/common/fs/zfs/dsl_pool.c
	usr/src/cmd/boot/bootadm/bootadm_upgrade.c