Eliminate race condition in signal handling
Kill service if it does not respond to signal
Merge pull request #1040 from control-center/feature/controllerShutdown

Container controller shutdown