Align XML with spec - Update Color control revision (#28763)

* Update colorcontrol cluster revision to 6, with scripts/tools/zap/update_cluster_revisions.py --cluster-id 0x0300 --new-revision 6 --old-revision 5

* run regen_all

* rebase and fix conflicts

* rebase and fix conflict 2
diff --git a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap
index 8b4cbf9..227be12 100644
--- a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap
+++ b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap
@@ -33,7 +33,33 @@
   ],
   "endpointTypes": [
     {
+      "id": 2,
       "name": "MA-rootdevice",
+      "deviceTypeRef": {
+        "id": 2,
+        "code": 22,
+        "profileId": 259,
+        "label": "MA-rootdevice",
+        "name": "MA-rootdevice"
+      },
+      "deviceTypes": [
+        {
+          "id": 2,
+          "code": 22,
+          "profileId": 259,
+          "label": "MA-rootdevice",
+          "name": "MA-rootdevice"
+        }
+      ],
+      "deviceTypeRefs": [
+        2
+      ],
+      "deviceVersions": [
+        1
+      ],
+      "deviceIdentifiers": [
+        22
+      ],
       "deviceTypeName": "MA-rootdevice",
       "deviceTypeCode": 22,
       "deviceTypeProfileId": 259,
@@ -5394,7 +5420,33 @@
       ]
     },
     {
+      "id": 1,
       "name": "Anonymous Endpoint Type",
+      "deviceTypeRef": {
+        "id": 40,
+        "code": 34,
+        "profileId": 259,
+        "label": "MA-speaker",
+        "name": "MA-speaker"
+      },
+      "deviceTypes": [
+        {
+          "id": 40,
+          "code": 34,
+          "profileId": 259,
+          "label": "MA-speaker",
+          "name": "MA-speaker"
+        }
+      ],
+      "deviceTypeRefs": [
+        40
+      ],
+      "deviceVersions": [
+        1
+      ],
+      "deviceIdentifiers": [
+        34
+      ],
       "deviceTypeName": "MA-speaker",
       "deviceTypeCode": 34,
       "deviceTypeProfileId": 259,
@@ -6586,18 +6638,14 @@
       "endpointTypeIndex": 0,
       "profileId": 259,
       "endpointId": 0,
-      "networkId": 0,
-      "endpointVersion": 1,
-      "deviceIdentifier": 22
+      "networkId": 0
     },
     {
       "endpointTypeName": "Anonymous Endpoint Type",
       "endpointTypeIndex": 1,
       "profileId": 260,
       "endpointId": 1,
-      "networkId": 0,
-      "endpointVersion": 1,
-      "deviceIdentifier": 34
+      "networkId": 0
     }
   ],
   "log": []