Merge branch '21.6-mg' into '21.6'

change versions of Powheg and Pythia8

See merge request atlas/athena!35998

Generators/PowhegControl/cmake/PowhegEnvironmentConfig.cmake.in

@@ -7,7 +7,7 @@
 # Set the environment variable(s):
 
 set( POWHEGENVIRONMENT_ENVIRONMENT
-    FORCESET POWHEGPATH "/cvmfs/atlas.cern.ch/repo/sw/Generators/powheg/ATLASOTF-00-04-04" )
+    FORCESET POWHEGPATH "/cvmfs/atlas.cern.ch/repo/sw/Generators/powheg/ATLASOTF-00-04-03" )
 #   FORCESET POWHEGPATH \${@CMAKE_PROJECT_NAME@_DIR}/PG-BOX )
 
 # Silently declare the module found.

Projects/AthGeneration/externals/Pythia8.cmake

@@ -3,6 +3,6 @@
 #
 
 message( INFO "Setting Pythia8 env. variables from AthGeneration" )
-set( PYTHIA8_LCGVERSION 244p3 )
+set( PYTHIA8_LCGVERSION 240p4 )
 set( PYTHIA8_LCGROOT
    ${LCG_RELEASE_DIR}/MCGenerators/pythia8/${PYTHIA8_LCGVERSION}/${LCG_PLATFORM} )