FIX: Inventory for cluster nodes who are part of multiple clusters
merge conflict
Code beautification for cmk -II on clusters
Remove conflict from ChangeLog
Switch version to 1.2.2b1
Merge branch 'master' of ssh://mathias-kettner.de/check_mk