memory optimization and minor bug fix
Merged refs/pull/3714/head from repository cms-sw
Merge pull request #3923 from degano/CMSSW_6_2_X_SLHC12_patch

Memory optimization and minor bug fix
merge changes with version from emmanuelle
merge
Merge branch 'L1Track_620_may30' of github.com:skinnari/cmssw into L1Track_620_may30