Merge pull request #7047 from s0undt3ch/0.16-merge

[0.16] SuSE based distributions get the `gid` from `users` not the `gid` from it's name
Test service status separately

Sometimes the 2 services return in different orders so we'll test for
each one separately
split those strings on their path
check for multiple strings in the test
remove commented out code