Fix ATLASRECTS-4700 and ATLASRECTS-4711

The problems in the first event reported in ATLASRECTS-4700 and ATLASRECTS-4711 are fixed by the changes.

However,

athena --threads=1 RecExRecoTest/RecExRecoTest_ART_egamma_fromESD.py

has a new error in the second event.