CMSSW_7_0_X

Changes needed for CMSSW version 7, including implementation of getByToken.