merge qa-build-lhcb-gen-sim-2021 commit c608890b from 2893687

mentioned in merge request !396 (merged)

@giordano : do NOT merge this one !397 (closed)

Instead: merge MR !396 (merged) which includes !397 (closed) which includes !393 (merged)

mentioned in merge request !393 (merged)

closed