Resolving cherry-pick issues from 21.2

...uctureMomentTools/EnergyCorrelatorGeneralizedRatiosTool.h

...SubStructureMomentTools/EnergyCorrelatorGeneralizedTool.h

...s/JetSubStructureMomentTools/EnergyCorrelatorRatiosTool.h

...ntTools/JetSubStructureMomentTools/EnergyCorrelatorTool.h

...ools/JetSubStructureMomentTools/NSubjettinessRatiosTool.h

...omentTools/JetSubStructureMomentTools/NSubjettinessTool.h

...omentTools/Root/EnergyCorrelatorGeneralizedRatiosTool.cxx

...ctureMomentTools/Root/EnergyCorrelatorGeneralizedTool.cxx

...bStructureMomentTools/Root/EnergyCorrelatorRatiosTool.cxx

.../JetSubStructureMomentTools/Root/EnergyCorrelatorTool.cxx

...tSubStructureMomentTools/Root/NSubjettinessRatiosTool.cxx

...Jet/JetSubStructureMomentTools/Root/NSubjettinessTool.cxx