Backport #18227 to 2014.1

Backport #18227 to 2014.1

Conflicts:
	salt/modules/zfs.py

Refs #18158