Resolve conflict problem from official CMSSW_6_2_X_SLHC

Fix conflict commit.