Remove controller from the picture as well

src/app/zap-templates/zcl/data-model/chip/messages-cluster.xml

@@ -21,8 +21,8 @@ limitations under the License.
     <cluster code="0x0097"/>
     <field name="ReceivedConfirmation" mask="0x1"/>
     <field name="ConfirmationResponse" mask="0x2"/>
-    <field name="ConfirmationReply" mask="0x3"/>
-    <field name="ProtectedMessages" mask="0x4"/>
+    <field name="ConfirmationReply" mask="0x4"/>
+    <field name="ProtectedMessages" mask="0x8"/>
   </bitmap>
 
   <bitmap name="MessageControlBitmap" type="bitmap32">
@@ -76,16 +76,16 @@ limitations under the License.
     <define>MESSAGES_CLUSTER</define>
     <client tick="false" init="false">true</client>
     <server tick="false" init="false">true</server>
-    <globalAttribute side="either" code="0xFFFD" value="1"/>
+    <globalAttribute side="either" code="0xFFFD" value="3"/><!-- Revision   -->
     <attribute side="server" code="0x0000" define="MESSAGES_CLUSTER_MESSAGES" type="ARRAY" entryType="MessageStruct" writable="false" max="8" optional="false">Messages</attribute>
     <attribute side="server" code="0x0001" define="MESSAGES_CLUSTER_ACTIVE_MESSAGES_IDS" type="ARRAY" entryType="octet_string" max="8" writable="false" optional="false">ActiveMessageIDs</attribute>
-    <command source="client" code="0x00" name="PresentMessagesRequest" optional="false">
+    <command source="client" code="0x00" name="PresentMessagesRequest" isFabricScoped="true" optional="false">
       <description>
         Command for requesting messages be presented
       </description>
       <arg name="Messages" type="octet_string" array="true"/>
     </command>
-    <command source="client" code="0x01" name="CancelMessagesRequest" optional="false">
+    <command source="client" code="0x01" name="CancelMessagesRequest" isFabricScoped="true" optional="false">
       <description>
         Command for cancelling message present requests
       </description>

src/controller/data_model/controller-clusters.zap

@@ -3350,67 +3350,6 @@
             }
           ]
         },
-        {
-          "name": "Messages",
-          "code": 151,
-          "mfgCode": null,
-          "define": "MESSAGES_CLUSTER",
-          "side": "client",
-          "enabled": 1,
-          "apiMaturity": "provisional",
-          "commands": [
-            {
-              "name": "PresentMessagesRequest",
-              "code": 0,
-              "mfgCode": null,
-              "source": "client",
-              "isIncoming": 0,
-              "isEnabled": 1
-            },
-            {
-              "name": "CancelMessagesRequest",
-              "code": 1,
-              "mfgCode": null,
-              "source": "client",
-              "isIncoming": 0,
-              "isEnabled": 1
-            }
-          ],
-          "attributes": [
-            {
-              "name": "FeatureMap",
-              "code": 65532,
-              "mfgCode": null,
-              "side": "client",
-              "type": "bitmap32",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "ClusterRevision",
-              "code": 65533,
-              "mfgCode": null,
-              "side": "client",
-              "type": "int16u",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "1",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            }
-          ]
-        },
         {
           "name": "Door Lock",
           "code": 257,