Allow service module to manage services not ending in .service

Fixes #3417