Forward port of IB/CMSSW_6_2_X/stable bits.
Merge pull request #561 from ktf/forward-port-devel472

Forward port of IB/CMSSW_6_2_X/stable bits.