Rebase on master

Author: Michail-Antropov

src/app/zap_cluster_list.json

@@ -132,8 +132,7 @@
         "WATER_HEATER_MANAGEMENT_CLUSTER": [],
         "WATER_HEATER_MODE_CLUSTER": [],
         "WIFI_NETWORK_DIAGNOSTICS_CLUSTER": [],
-        "WINDOW_COVERING_CLUSTER": [],
-        "ENERGY_CALENDAR_CLUSTER": [],
+        "WINDOW_COVERING_CLUSTER": []
     },
     "ServerDirectories": {
         "ACCESS_CONTROL_CLUSTER": ["access-control-server"],
@@ -180,7 +179,7 @@
         "DIAGNOSTIC_LOGS_CLUSTER": ["diagnostic-logs-server"],
         "DISHWASHER_ALARM_CLUSTER": ["dishwasher-alarm-server"],
         "DISHWASHER_MODE_CLUSTER": ["mode-base-server"],
-        "ENERGY_CALENDAR_CLUSTER": [],
+        "ENERGY_CALENDAR_CLUSTER": ["energy-calendar-server"],
         "MICROWAVE_OVEN_MODE_CLUSTER": ["mode-base-server"],
         "DOOR_LOCK_CLUSTER": ["door-lock-server"],
         "ECOSYSTEM_INFORMATION_CLUSTER": ["ecosystem-information-server"],
@@ -316,7 +315,5 @@
         "WINDOW_COVERING_CLUSTER": ["window-covering-server"],
         "WATER_HEATER_MANAGEMENT_CLUSTER": ["water-heater-management-server"],
         "WATER_HEATER_MODE_CLUSTER": ["mode-base-server"]
-        "ENERGY_CALENDAR_CLUSTER": ["energy-calendar-server"],
-        "ZLL_COMMISSIONING_CLUSTER": []
     }
 }