Allow service module to manage services not ending in .service

Fixes #3417
Merge branch 'issue_3417_systemd_stuff' into devel