master
Add back explicit categories where needed
Snapshot of CMSSW_6_2_0_pre8.
move to the geometry from DB