Addressing review comments from Boris

Author: PeterC1965

src/app/zap-templates/zcl/zcl-with-test-extensions.json

@@ -638,7 +638,6 @@
         "Power Topology": ["FeatureMap"],
         "Valve Configuration and Control": ["RemainingDuration"],
         "Boolean State Configuration": ["CurrentSensitivityLevel"],
-        "Water Heater Management": ["FeatureMap"],
         "Wi-Fi Network Management": ["SSID"]
     },
     "defaultReportingPolicy": "mandatory",

src/app/zap-templates/zcl/zcl.json

@@ -636,7 +636,6 @@
         "Power Topology": ["FeatureMap"],
         "Valve Configuration and Control": ["RemainingDuration"],
         "Boolean State Configuration": ["CurrentSensitivityLevel"],
-        "Water Heater Management": ["FeatureMap"],
         "Wi-Fi Network Management": ["SSID"]
     },
     "defaultReportingPolicy": "mandatory",

src/app/zap_cluster_list.json

@@ -129,7 +129,6 @@
         "WAKE_ON_LAN_CLUSTER": [],
         "LAUNDRY_WASHER_CONTROLS_CLUSTER": [],
         "LAUNDRY_DRYER_CONTROLS_CLUSTER": [],
-        "WATER_HEATER_MANAGEMENT_CLUSTER": [],
         "WIFI_NETWORK_DIAGNOSTICS_CLUSTER": [],
         "WINDOW_COVERING_CLUSTER": [],
         "ZLL_COMMISSIONING_CLUSTER": []
@@ -312,8 +311,6 @@
         "WIFI_NETWORK_DIAGNOSTICS_CLUSTER": ["wifi-network-diagnostics-server"],
         "WIFI_NETWORK_MANAGEMENT_CLUSTER": ["wifi-network-management-server"],
         "WINDOW_COVERING_CLUSTER": ["window-covering-server"],
-        "WATER_HEATER_MANAGEMENT_CLUSTER": [],
-        "WATER_HEATER_MANAGEMENT_CLUSTER": ["water-heater-management-server"],
         "ZLL_COMMISSIONING_CLUSTER": []
     }
 }