Following changes in the modernization of GenCountersFSR and GenFSR
This introduces only the necessary changes in the code to unclog lhcb-gaussino slot in order make the rebasing/porting less painful. It follows fixes from lhcb/Gauss!761 (merged) to changes in lhcb/LHCb!3121 (merged)