916666: Change method of service detection
Merge pull request #850 from candlepin/wottop/916666

Change method of service detection