Fixes found by unit test

src/FirmwarePlugin/APM/MavCmdInfoCommon.json

@@ -4,6 +4,11 @@
     "version": 1,
 
     "mavCmdInfo": [
+        {
+            "id":           16,
+            "comment":      "MAV_CMD_NAV_WAYPOINT",
+            "paramRemove":  "2"
+        },
         {
             "id":                   84,
             "comment":              "MAV_CMD_NAV_VTOL_TAKEOFF",

src/FirmwarePlugin/PX4/MavCmdInfoCommon.json

@@ -4,5 +4,10 @@
     "version": 1,
 
     "mavCmdInfo": [
+        {
+            "id":           16,
+            "comment":      "MAV_CMD_NAV_WAYPOINT",
+            "paramRemove":  "2,3,4"
+        }
     ]
 }

src/FirmwarePlugin/PX4/MavCmdInfoFixedWing.json

@@ -4,11 +4,6 @@
     "version": 1,
 
     "mavCmdInfo": [
-        {
-            "id":           16,
-            "comment":      "MAV_CMD_NAV_WAYPOINT",
-            "paramRemove":  "3,4"
-        },
         {
             "id":           21,
             "comment":      "MAV_CMD_NAV_LAND",