Backport #18153 to 2014.1

Backport #18153 to 2014.1

Conflicts:
	salt/modules/zypper.py