From cmssw 7 1 x phase1 upgrade

Code for the phase1 Upgrade