Merge branch 'imdm/2-ember-iterate' into imdm/3-ember-read-attribute

Author: andreilitvin

src/app/codegen-interaction-model/CodegenDataModel.h

@@ -16,7 +16,6 @@
  */
 #pragma once
 
-#include "app/ConcreteClusterPath.h"
 #include <app/interaction-model/Model.h>
 
 #include <app/util/af-types.h>

src/app/codegen-interaction-model/tests/TestCodegenModelViaMocks.cpp

@@ -37,6 +37,7 @@
 #include <app/util/mock/MockNodeConfig.h>
 #include <app/util/odd-sized-integers.h>
 #include <lib/core/CHIPError.h>
+#include <lib/core/DataModelTypes.h>
 #include <lib/core/StringBuilderAdapters.h>
 #include <lib/core/TLVDebug.h>
 #include <lib/core/TLVReader.h>