Backport #18232 to 2014.1

Backport #18232 to 2014.1

Conflicts:
	salt/modules/pacman.py