Merge remote-tracking branch 'origin/rc/2.6' into jsinglet/dev-mergeback-26

# Conflicts:
#	c/cert/src/qlpack.yml
#	c/cert/test/qlpack.yml
#	c/common/src/qlpack.yml
#	c/common/test/qlpack.yml
#	c/misra/src/qlpack.yml
#	c/misra/test/qlpack.yml
#	cpp/autosar/src/qlpack.yml
#	cpp/autosar/test/qlpack.yml
#	cpp/cert/src/qlpack.yml
#	cpp/cert/test/qlpack.yml
#	cpp/common/src/qlpack.yml
#	cpp/common/test/qlpack.yml
#	cpp/misra/src/qlpack.yml
#	cpp/misra/test/qlpack.yml
#	cpp/report/src/qlpack.yml

Author: jsinglet

change_notes/2022-07-21-performance-fix-to-deadlock-query.md

@@ -0,0 +1,4 @@
+- `CON53-CPP` - `DeadlockByLockingInPredefinedOrder.ql`
+  - Optimized performance by removing unneeded conditionals. 
+- `CON35-C`  - `DeadlockByLockingInPredefinedOrder.ql`
+  - Optimized performance by removing unneeded conditionals. 

cpp/common/src/codingstandards/cpp/rules/preventdeadlockbylockinginpredefinedorder/PreventDeadlockByLockingInPredefinedOrder.qll

@@ -25,7 +25,6 @@ predicate getAnOrderedLockPair(
   lock2 = node.coveredByLock() and
   not lock1 = lock2 and
   lock1.getEnclosingFunction() = lock2.getEnclosingFunction() and
-  node.(Expr).getEnclosingFunction() = lock1.getEnclosingFunction() and
   exists(Location l1Loc, Location l2Loc |
     l1Loc = lock1.getLocation() and
     l2Loc = lock2.getLocation()