Other fixes

Author: ratgr

examples/energy-management-app/energy-management-common/energy-management-app.matter

@@ -2576,7 +2576,7 @@ provisional cluster DeviceEnergyManagementMode = 159 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 2;
+  device type ma_rootdevice = 22, version 3;
   device type ma_otarequestor = 18, version 1;
 
   binding cluster OtaSoftwareUpdateProvider;
@@ -2762,9 +2762,6 @@ endpoint 0 {
     handle command UpdateFabricLabel;
     handle command RemoveFabric;
     handle command AddTrustedRootCertificate;
-    handle command SetVidVerificationStatement;
-    handle command SignVidVerificationRequest;
-    handle command SignVidVerificationResponse;
   }
 
   server cluster GroupKeyManagement {

examples/energy-management-app/energy-management-common/energy-management-app.zap

@@ -61,7 +61,7 @@
         }
       ],
       "deviceVersions": [
-        2,
+        3,
         1
       ],
       "deviceIdentifiers": [
@@ -2126,30 +2126,6 @@
               "source": "client",
               "isIncoming": 1,
               "isEnabled": 1
-            },
-            {
-              "name": "SetVidVerificationStatement",
-              "code": 12,
-              "mfgCode": null,
-              "source": "client",
-              "isIncoming": 1,
-              "isEnabled": 1
-            },
-            {
-              "name": "SignVidVerificationRequest",
-              "code": 13,
-              "mfgCode": null,
-              "source": "client",
-              "isIncoming": 1,
-              "isEnabled": 1
-            },
-            {
-              "name": "SignVidVerificationResponse",
-              "code": 14,
-              "mfgCode": null,
-              "source": "server",
-              "isIncoming": 0,
-              "isEnabled": 1
             }
           ],
           "attributes": [