Manual fixes for aliased clusters (pending 1.2.4 fix in scraper)

Author: cecille

data_model/clusters/ConcentrationMeasurement.xml

@@ -55,13 +55,14 @@ Connectivity Standards Alliance
 508 Second Street, Suite 206
 Davis, CA 95616, USA
 -->
-<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x040C" name="Carbon Monoxide Concentration Measurement" revision="3">
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="" name="Concentration Measurement Clusters" revision="3">
   <revisionHistory>
     <revision revision="1" summary="Mandatory global ClusterRevision attribute added"/>
     <revision revision="2" summary="CCB 2882"/>
     <revision revision="3" summary="Cluster redesigned to add support for Level Indication, Peak/Average Measurement, Medium/Unit of Measurement and Uncertainty."/>
   </revisionHistory>
   <clusterIds>
+    <clusterId id="0x040C" name="Carbon Monoxide Concentration Measurement"/>
     <clusterId id="0x040D" name="Carbon Dioxide Concentration Measurement"/>
     <clusterId id="0x0413" name="Nitrogen Dioxide Concentration Measurement"/>
     <clusterId id="0x0415" name="Ozone Concentration Measurement"/>

data_model/clusters/ResourceMonitoring.xml

@@ -55,11 +55,12 @@ Connectivity Standards Alliance
 508 Second Street, Suite 206
 Davis, CA 95616, USA
 -->
-<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0071" name="HEPA Filter Monitoring" revision="1">
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="" name="Resource Monitoring Clusters" revision="1">
   <revisionHistory>
     <revision revision="1" summary="Initial version of the Resource Monitoring cluster"/>
   </revisionHistory>
   <clusterIds>
+    <clusterId id="0x0071" name="HEPA Filter Monitoring"/>
     <clusterId id="0x0072" name="Activated Carbon Filter Monitoring"/>
   </clusterIds>
   <classification hierarchy="base" role="application" picsCode="REPM" scope="Endpoint"/>

data_model/clusters/WaterContentMeasurement.xml

@@ -55,7 +55,7 @@ Connectivity Standards Alliance
 508 Second Street, Suite 206
 Davis, CA 95616, USA
 -->
-<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0405" name="Relative Humidity Measurement" revision="3">
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="" name="Water Content Measurement Clusters" revision="3">
   <revisionHistory>
     <revision revision="1" summary="Mandatory global ClusterRevision attribute added"/>
     <revision revision="2" summary="CCB 2241"/>