master
Snapshot of CMSSW_6_2_0_pre8.
avoid delayed initialization, update tests
code checks and format
introduce a struct to collect ESTokens and simplify initialization