fix check for service status
Merge branch 'master' into merge-upstream

* master:
  fix check for service status

Conflicts:
	manifests/service.pp