Rivet_i sync with 21.6
Rivet_i
is currently excluded from the master nightlies, but this change set will fix a weight-ordering issue when using HepMC2 in anticipation of the upcoming new LCG layer, and it also simplifies some logic when using HepMC3.
cc/ @ewelina