Merge pull request #7568 from crosbymichael/replace-7240

Exit after receiving SIGTERM

pkg/signal/trap.go

@@ -38,6 +38,7 @@ func Trap(cleanup func()) {
 						if atomic.LoadUint32(&interruptCount) == 1 {
 							// Call cleanup handler
 							cleanup()
+							os.Exit(0)
 						} else {
 							return
 						}