Daily merge for 22.0 into master, Sept 23

Manually resolved a conflict in FlavorTagDiscriminants/BTagJetAugmenter.h/cxx that arose form @christos' MR !56090 (merged) and @dguest's MR !56882 (merged)

Control/AthenaMonitoring/python/AthenaMonitoringCfg.py

@@ -79,6 +79,11 @@ def AthenaMonitoringCfg(flags):
         info('Set up Jet monitoring')
         from JetMonitoring.JetMonitoringStandard import standardJetMonitoring
         result.merge(standardJetMonitoring(flags))
+        #Need to create links between global FE, created in jet finding, and other objects
+        #MET monitoring will need these in some workflows (but not in tier0ESD)
+        if flags.DQ.Environment != 'tier0ESD':
+            from eflowRec.PFCfg import PFGlobalFlowElementLinkingCfg
+            result.merge(PFGlobalFlowElementLinkingCfg(flags))
         
     if flags.DQ.Steering.doJetInputsMon:
         info('Set up Jet Inputs monitoring')
@@ -158,4 +163,4 @@ def AthenaMonitoringPostprocessingCfg(flags):
         ppa.FileKey = ((flags.DQ.FileKey + '/') if not flags.DQ.FileKey.endswith('/')
                     else flags.DQ.FileKey)
     result.addEventAlgo(ppa, "AthEndSeq")
-    return result
\ No newline at end of file
+    return result