Avoid a few more odr warnings in lto builds

Closed Christos Anastopoulos requested to merge ATLAS-EGamma/athena:odr_fixes_lto_3 into master

Avoid a few more odr warnings in lto builds

Merge request reports