When using "raw" it would fail the "invalid all zeros key" test due to
tmpkeylen being 0.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	lib/libzfs/libzfs_crypto.c
"props" is eagerly freed just before they are used. Most likely left behind
in error. Fixes https://github.com/zfsrogue/zfs-crypto/issues/19
Merge branch 'master' of git://github.com/zfsrogue/zfs-crypto
Method "-o keysource=passphrase,file://" was missing pkcs11_read_data(), lift
that in from OpenSolaris. Reading from file and /dev/random works hopefully
fixing https://github.com/zfsrogue/zfs-crypto/issues/20
Merge pull request #22 from lundman/master

Fix issues #19 #20