Backport #18217 to 2014.1

Backport #18217 to 2014.1

Conflicts:
	salt/modules/systemd.py