From: Brian Behlendorf <behlendorf1@llnl.gov>
Subject: [PATCH] fix branch

Merged result of all expected upstream ZFS fixes

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>