[madgraph2022 v0.5/MR 659 and v0.6/MR 660] merge qa-build-mg5amc-madgraph4gpu-2022 commit 2a83a362 from 4440817

This is the MR into master of the patches that went into qa-build-mg5amc-madgraph4gpu-2022 for MR !659 (merged) (v0.5) and MR !660 (merged) (v0.6). I will document the changes in !659 (merged) and in !660 (merged).

Note that a MR into master was not autogenerated for v0.5, because the pipeline failed in the very last step, the upload to harbor of the singularity image. The docker image had been built tested and uploaded successfully. The singularity image for v0.5 had been built and tested successfully but failed the upload. For completeness, I uploaded it manually by converting the docker v0.5 image, see BMK-1054. In any case that singularity v0.5 image is superseded by the v0.6 image, which is currently the latest.