Merge branch 'master' into kd-live

server.go

@@ -129,7 +129,7 @@ func (server *Server) shutdown() {
 
 	if atomic.LoadInt64(&healthcheckcounter) > 0 {
 		atomic.StoreInt64(&healthcheckcounter, math.MinInt64)
-		for atomic.LoadInt64(&healthcheckcounter)-math.MinInt64 > 10 {
+		for atomic.LoadInt64(&healthcheckcounter)-math.MinInt64 == 0 {
 			time.Sleep(100 * time.Millisecond)
 		}
 	}