saltstack/salt — pull request #18811 by rallytime (2014-12-08 20:33:36+00:00)
Title: Backport #18217 to 2014.1

Backport #18217 to 2014.1

Conflicts:
salt/modules/systemd.py