C#/Java: Update model converter queries to handle kind information.

Author: michaelnebel

csharp/ql/src/utils/modelconverter/ExtractNeutrals.ql

@@ -7,8 +7,9 @@
 import csharp
 import semmle.code.csharp.dataflow.ExternalFlow
 
-from string package, string type, string name, string signature, string provenance
+from string package, string type, string name, string signature, string kind, string provenance
 where
-  neutralModel(package, type, name, signature, provenance) and
+  neutralModel(package, type, name, signature, kind, provenance) and
   not provenance.matches("%generated")
-select package, type, name, signature, provenance order by package, type, name, signature
+select package, type, name, signature, kind, provenance order by
+    package, type, name, signature, kind

java/ql/src/utils/modelconverter/ExtractNeutrals.ql

@@ -7,8 +7,9 @@
 import java
 import semmle.code.java.dataflow.ExternalFlow
 
-from string package, string type, string name, string signature, string provenance
+from string package, string type, string name, string signature, string kind, string provenance
 where
-  neutralModel(package, type, name, signature, provenance) and
+  neutralModel(package, type, name, signature, kind, provenance) and
   not provenance.matches("%generated")
-select package, type, name, signature, provenance order by package, type, name, signature
+select package, type, name, signature, kind, provenance order by
+    package, type, name, signature, kind