Add patch from John Hixson which corrects some bugs figuring out which ZFS
dataset we are pulling from
Add ZFS tank fix to pbi-manager as well