Align to CMSSW_6_1_2_SLHC6.
Merge pull request #1 from cms-sw/CMSSW_6_1_X_SLHC

Align to CMSSW_6_1_2_SLHC6.