Merge remote-tracking branch 'upstream/rc/1.23' into mergeback-20191202

Conflicts solved:
	javascript/extractor/src/com/semmle/js/extractor/Main.java
	javascript/ql/test/query-tests/Statements/UseOfReturnlessFunction/tst.js

python/ql/src/Filters/NotGenerated.ql

@@ -1,7 +1,7 @@
 /**
  * @name Filter: non-generated files
  * @description Only keep results that aren't (or don't appear to be) generated.
- * @kind file-classifier
+ * @kind problem
  * @id py/not-generated-file-filter
  */
 import python

python/ql/src/Filters/NotTest.ql

@@ -1,7 +1,7 @@
 /**
  * @name Filter: non-test files
  * @description Only keep results that aren't in tests
- * @kind file-classifier
+ * @kind problem
  * @id py/not-test-file-filter
  */
 import python