[checkmk-commits] Cleaned up tag config + builtin merging