release/21.6.36

Ewelina Maria Lobodzinska

@ewelina

81dd752b · Merge branch '21.6-nEPJ' into '21.6' · Jul 10, 2020

contains MRs:
https://gitlab.cern.ch/atlas/athena/-/merge_requests/34610
https://gitlab.cern.ch/atlas/athena/-/merge_requests/34614