Changes for #88417: Request to commit/port fixes to ANALYSIS/AliFileMerger.{h,cxx}