Merge remote-tracking branch 'origin/systemd-support' into local

trivial merge conflict

Conflicts:
	manifests/server.pp