saltstack/salt — pull request #18928 by rallytime (2014-12-11 20:34:11+00:00)
Title: Backport #18227 to 2014.1

Backport #18227 to 2014.1

Conflicts:
salt/modules/zfs.py

Refs #18158