Added deb/rh OS detection for correct service naming
Merge branch 'os-detection'