Changes to get NTupleTools to compile in CMSSW_7_0_9_patch3