[checkmk-commits] [tribe29/checkmk] 5b3721: fix another broken merge