Merge remote-tracking branch 'zfsonlinux/master'

Conflicts:
	dracut/02zfsexpandknowledge/Makefile.am
	dracut/90zfs/module-setup.sh.in
	dracut/90zfs/mount-zfs.sh.in