zfs.git: Fix vdev_id error when plugging in a disk (#3161)