Removed deprecated iscsiprovider property which got merged while rebasing
Merge branch 'zfs-generic-v2' into testing