Merge branch 'master' of git://github.com/zfsrogue/zfs-crypto into feature
pool upgrade needs to increment feature@encryption
Merge branch 'master' of git://github.com/zfsrogue/zfs-crypto into feature-import
Merge branch 'feature-import'

Now that we use pool features, we can leave the ability to handle
pool v30, since the default pool version is 5000. Thus we can
import Solaris pools directly, using encryption, into feature pools.

Conflicts:
	include/sys/fs/zfs.h