Added better handlign of bad json.
Added misssing x flag on zfs send.
Merge branch 'test' into dev