IKEA bulbs - merged some DDFs

Author: mattreim

devices/ikea/tradfri_bulb_e14_ws_470lm.json

@@ -1,10 +1,16 @@
 {
   "schema": "devcap1.schema.json",
   "uuid": "5d4a970d-3a95-4e2b-8aa8-82a885221fe1",
-  "manufacturername": "$MF_IKEA",
-  "modelid": "TRADFRIbulbE14WScandleopal470lm",
+  "manufacturername": [
+    "$MF_IKEA",
+    "$MF_IKEA"
+  ],
+  "modelid": [
+    "TRADFRI bulb E14 WS 470lm",
+    "TRADFRIbulbE14WScandleopal470lm"
+  ],
   "vendor": "IKEA",
-  "product": "Tradfri LED bulb E14 470 lumen, dimmable white spectrum, chandelier opal (LED1949C5)",
+  "product": "Tradfri LED bulb E14 470 lumen, dimmable white spectrum, chandelier opal (LED1835C6/LED1949C5)",
   "sleeper": false,
   "status": "Gold",
   "subdevices": [

devices/ikea/tradfri_bulb_e14_ws_candle_opal_470lm.json

@@ -1,10 +1,16 @@
 {
   "schema": "devcap1.schema.json",
   "uuid": "8ecd84ad-4015-4b9e-bee2-311e750ee974",
-  "manufacturername": "$MF_IKEA",
-  "modelid": "TRADFRI bulb E14 WS opal 400lm",
+  "manufacturername": [
+    "$MF_IKEA",
+    "$MF_IKEA"
+  ],
+  "modelid": [
+    "TRADFRI bulb E14 WS opal 400lm",
+    "TRADFRI bulb E14 WS opal 600lm"
+  ],
   "vendor": "IKEA",
-  "product": "Tradfri LED bulb E14 400 lumen, dimmable white spectrum, opal white (LED1536G5)",
+  "product": "Tradfri LED bulb E14 400/600 lumen, dimmable white spectrum, opal white (LED1536G5/LED1733G7)",
   "sleeper": false,
   "status": "Gold",
   "subdevices": [