Revert "Merge branch 'disable_calo_AOD_trigedm' into 'master'"

This reverts merge request !27070 (merged)
Removing the full-scan calo cluster container from the AOD output created problems for the HLT Calo monitoring. Returning it until a better solution is found.