CC-363: Don't wait for a started event if the service has already started.
Merge pull request #1244 from control-center/feature/CC-363

CC-363: Don't wait for a started event if the service has already started