Merge branch 'fix-branch' into refs/top-bases/zfs-branch

diff --cc lib/libzfs/libzfs_util.c
index 8d0c47e301a1c05282f82d6c21bdfc99480e408c,4da0fb44b2c1aba95bcca3a42b9d165d0ebda26d..dfb24b32904c6ff7ac9def6431a1eae9afb8d833
--- 1/lib/libzfs/libzfs_util.c
--- 2/lib/libzfs/libzfs_util.c
+++ b/lib/libzfs/libzfs_util.c
@@@ -685,10 -686,10 +685,10 @@@ in
  zcmd_alloc_dst_nvlist(libzfs_handle_t *hdl, zfs_cmd_t *zc, size_t len)
  {
        if (len == 0)
-               len = 128*1024;
+               len = 2048;
        zc->zc_nvlist_dst_size = len;
        if ((zc->zc_nvlist_dst = (uint64_t)(uintptr_t)
 -          zfs_alloc(hdl, zc->zc_nvlist_dst_size)) == NULL)
 +          zfs_alloc(hdl, zc->zc_nvlist_dst_size)) == 0)
                return (-1);
  
        return (0);