Added some retry logic when services get restarted and ensure that lock ...

...is observed when starting individual instances


https://jira.zenoss.com/browse/CC-321