Commit fixes outside of files with merge conflicts

Author: MichaelRFairhurst

cpp/common/src/codingstandards/cpp/rules/donotdeleteanarraythroughapointeroftheincorrecttypeshared/DoNotDeleteAnArrayThroughAPointerOfTheIncorrectTypeShared.qll

@@ -7,7 +7,7 @@
 import cpp
 import codingstandards.cpp.Customizations
 import codingstandards.cpp.Exclusions
-import semmle.code.cpp.dataflow.DataFlow
+import semmle.code.cpp.dataflow.new.DataFlow
 
 signature module DoNotDeleteAnArrayThroughAPointerOfTheIncorrectTypeSharedConfigSig {
   Query getQuery();

cpp/common/src/codingstandards/cpp/rules/possibledataracebetweenthreadsshared/PossibleDataRaceBetweenThreadsShared.qll

@@ -8,7 +8,7 @@
 import cpp
 import codingstandards.cpp.Customizations
 import codingstandards.cpp.Exclusions
-import codingstandards.cpp.Concurrency
+import codingstandards.cpp.ConcurrencyNew
 import codingstandards.cpp.lifetimes.StorageDuration
 
 signature module PossibleDataRaceBetweenThreadsSharedConfigSig {

cpp/common/test/rules/donotdeleteanarraythroughapointeroftheincorrecttypeshared/DoNotDeleteAnArrayThroughAPointerOfTheIncorrectTypeShared.expected

@@ -1,10 +1,14 @@
 problems
 | test.cpp:9:12:9:13 | l1 | test.cpp:6:19:6:37 | new[] | test.cpp:9:12:9:13 | l1 | Array of type 'DerivedClass *' is deleted through a pointer of type 'BaseClass *'. |
 edges
+| test.cpp:6:19:6:37 | new[] | test.cpp:6:19:6:37 | new[] | provenance |  |
 | test.cpp:6:19:6:37 | new[] | test.cpp:9:12:9:13 | l1 | provenance |  |
+| test.cpp:7:22:7:40 | new[] | test.cpp:7:22:7:40 | new[] | provenance |  |
 | test.cpp:7:22:7:40 | new[] | test.cpp:10:12:10:13 | l2 | provenance |  |
 nodes
 | test.cpp:6:19:6:37 | new[] | semmle.label | new[] |
+| test.cpp:6:19:6:37 | new[] | semmle.label | new[] |
+| test.cpp:7:22:7:40 | new[] | semmle.label | new[] |
 | test.cpp:7:22:7:40 | new[] | semmle.label | new[] |
 | test.cpp:9:12:9:13 | l1 | semmle.label | l1 |
 | test.cpp:10:12:10:13 | l2 | semmle.label | l2 |