Remove vehicle folding solar panels

These are voluminous enough that it doesn't make sense to have a whole
lot on a folding vehicle, and they don't deliver that much juice either.
It just makes more sense to carry around the folding panels and deploy
them.
Also, these are too big (surface area) to fit on a vehicle tile.

data/json/furniture_and_terrain/appliances.json

@@ -677,17 +677,25 @@
     "name": { "str": "deployed folding solar panel" },
     "flags": [ "SOLAR_PANEL", "OBSTACLE", "APPLIANCE" ],
     "description": "This folding solar panel has been unfolded, and it is ready to charge connected devices, if the sun is out.",
-    "copy-from": "foldable_solar_panel",
+    "copy-from": "solar_panel",
+    "color": "light_blue",
+    "broken_color": "light_gray",
+    "proportional": { "durability": 0.5 },
+    "epower": "120 W",
     "requirements": { "removal": { "time": "5 s" } },
+    "breaks_into": [ { "item": "folding_solar_panel", "damage": [ 5, 5 ] } ],
     "remove_as": "folding_solar_panel",
     "item": "folding_solar_panel_deployed"
   },
   {
     "type": "vehicle_part",
     "id": "ap_folding_solar_panel_v2",
     "flags": [ "SOLAR_PANEL", "OBSTACLE", "APPLIANCE" ],
+    "name": { "str": "deployed solar suitcase" },
     "description": "This solar suitcase has been unpacked and is ready to supply power.",
-    "copy-from": "advanced_foldable_solar_panel",
+    "copy-from": "ap_folding_solar_panel",
+    "epower": "200 W",
+    "breaks_into": [ { "item": "folding_solar_panel_v2", "damage": [ 5, 5 ] } ],
     "requirements": { "removal": { "time": "1 m" } },
     "remove_as": "folding_solar_panel_v2",
     "item": "folding_solar_panel_v2_deployed"

data/json/obsoletion/migration_vehicle_parts.json

@@ -71,6 +71,16 @@
     "to": "seat",
     "variant": "windshield_front"
   },
+  {
+    "type": "vehicle_part_migration",
+    "from": "foldable_solar_panel",
+    "to": "solar_panel"
+  },
+  {
+    "type": "vehicle_part_migration",
+    "from": "advanced_foldable_solar_panel",
+    "to": "solar_panel_v2"
+  },
   {
     "type": "vehicle_part_migration",
     "from": "seat_swivel_chair",

data/json/vehicleparts/vehicle_parts.json

@@ -1758,32 +1758,6 @@
     "damage_reduction": { "all": 9 },
     "variants": [ { "symbols": "Y", "symbols_broken": "X" } ]
   },
-  {
-    "type": "vehicle_part",
-    "id": "foldable_solar_panel",
-    "copy-from": "solar_panel",
-    "//": "See item definition for stats",
-    "name": { "str": "folding solar panel" },
-    "color": "light_blue",
-    "broken_color": "light_gray",
-    "proportional": { "durability": 0.5 },
-    "epower": "120 W",
-    "folded_volume": "8 L",
-    "description": "A folding solar panel.  Not designed for mounting to a vehicle, but who will stop you now?",
-    "breaks_into": [ { "item": "folding_solar_panel", "damage": [ 5, 5 ] } ],
-    "item": "folding_solar_panel"
-  },
-  {
-    "type": "vehicle_part",
-    "id": "advanced_foldable_solar_panel",
-    "copy-from": "foldable_solar_panel",
-    "name": { "str": "deployed solar suitcase" },
-    "epower": "200 W",
-    "folded_volume": "40 L",
-    "description": "Unpack a solar suitcase and stick it on the roof.  What could go wrong?",
-    "breaks_into": [ { "item": "folding_solar_panel_v2", "damage": [ 5, 5 ] } ],
-    "item": "folding_solar_panel_v2"
-  },
   {
     "type": "vehicle_part",
     "id": "reinforced_solar_panel",