Merge branch 'cherry-pick-ce1b96a7dd-master' into 'master'

Sweeping !6949 from 21.0 to master.
Add FTK=True flags to Trigger and Reco for ART TriggerTest FTK jobs

See merge request atlas/athena!7049

Trigger/TrigValidation/TriggerTest/test/test_mc_pp_v7_nops_aod_ftk_build.sh

@@ -25,6 +25,7 @@ export INPUT="ftk"
 export JOBOPTIONS="TriggerTest/testCommonSliceAthenaTrigRDOtoAOD.py"
 export EVENTS="5"
 export COST_MONITORING="False"
+export EXTRA="from TriggerJobOpts.TriggerFlags import TriggerFlags;TriggerFlags.doFTK=True;from RecExConfig.RecFlags import rec;rec.doFTK.set_Value_and_Lock(True);"
 
 source exec_athena_art_trigger_validation.sh
 source exec_art_triggertest_post.sh

Trigger/TrigValidation/TriggerTest/test/test_mc_pp_v7_nops_aod_ftk_grid.sh

@@ -10,7 +10,7 @@
 # art-output: HLTChain.txt
 # art-output: HLTTE.txt
 # art-output: L1AV.txt
-# art-output: HLTconfig_*.xml
+# art-output: HLTconfig*.xml
 # art-output: L1Topoconfig*.xml
 # art-output: LVL1config*.xml
 # art-output: *.log
@@ -23,6 +23,7 @@ export NAME="mc_pp_v7_nops_aod_ftk_grid"
 export MENU="MC_pp_v7_no_prescale"
 export INPUT="ftk"
 export JOBOPTIONS="TriggerTest/testCommonSliceAthenaTrigRDOtoAOD.py"
+export EXTRA="from TriggerJobOpts.TriggerFlags import TriggerFlags;TriggerFlags.doFTK=True;from RecExConfig.RecFlags import rec;rec.doFTK.set_Value_and_Lock(True);"
 
 source exec_athena_art_trigger_validation.sh
 source exec_art_triggertest_post.sh