Updates for 2.1.5

I've been poking at the zfs packaging just to get this running on my laptop with the 5.18 kernel in stable-backports.

These are the changes that got me going.