Revert my master back to globe master
Mod to allow compilation of regression code (GBRLikelihood) in CMSSW_6_X_X