Sweeping !28953 from 21.0 to master. Fix discrepancy seen when creating param files with single and multiple energy slices

Fix discrepancy seen when creating param files with single and multiple energy slices

See merge request !28953 (merged)