The way we were testing if $services had a particular word in it is not very
good. If we search for the word 'tor' we will find it when the variable contains
"monitor".

This commit makes the regular expression more specific based on the word
boundaries.

Change-Id: I4dcd80db7322cabc3f71b77fabf7eacd83b4d572