wip: port to CMSSW 6.2.x