[checkmk-commits] Check_MK Git: check_mk: resolved gitbug merge conflict