master
Add back explicit categories where needed
Offline DB Loader clean up
Snapshot of CMSSW_6_2_0_pre8.