Backport #18274 to 2014.1

Backport #18274 to 2014.1

Conflicts:
	salt/modules/freebsdpkg.py