Test branch

Changes include getByToken implementation and some other minor changes needed for CMSSW7.