CLC-2053 Fix critical logging bugs (server-killers)