Reveiwer Matt - Add pattern to allow 'service stop' to work

Tested on my Homer instance.

I've also removed my previous (unsuccessful) fix to simplify our recipe.