Do not merge #6896

As requested by Bill, this will avoid auto merging #6896 to CMSSW_7_4_ROOT6_X.