don't hack to ignore retcode

Conflicts:
	salt/modules/zfs.py
Merge pull request #18928 from rallytime/cp-18227

Backport #18227 to 2014.1