Removed recursive service update
fixed unit test
Merge pull request #1376 from control-center/feature/CC-558

Removed recursive service update