Backport #18450 to 2014.1

Backport #18450 to 2014.1

Conflicts:
	salt/modules/aptpkg.py