release/21.6.39

Ewelina Maria Lobodzinska

@ewelina

3ba59831 · Merge branch '21.6-nEPJ' into '21.6' · Jul 30, 2020

includes MR:
https://gitlab.cern.ch/atlas/athena/-/merge_requests/35245
https://gitlab.cern.ch/atlas/athena/-/merge_requests/35252