Merge "Heka stalled alert improvement"