[PATCH 2/6] Removed CCI references from Group tag and added to appropriate Rule tag.