CMSSW_6_1_2_SLHC8_patch2

This is CMSSW_6_1_2_SLHC8_patch1 + #705 as requested by David Lange