Fixed race condition with abruptly starting/stopping containers
Merge pull request #1105 from control-center/feature/agent-normal-shutdown

Fixed race condition with abruptly starting/stopping containers