Cherry-pick CaloCollector changes from CaloChallenge MR
This is to separate changes that were applied in !1001 so that Gaussino/Gaussino!150 (merged) Gaussino/Gaussino!155 Gaussino/Gaussino!154 can already be merged.
This is to separate changes that were applied in !1001 so that Gaussino/Gaussino!150 (merged) Gaussino/Gaussino!155 Gaussino/Gaussino!154 can already be merged.