Makefile fixes for zfs_util and bundle