Prevent automatic merge to CMSSW_7_3_ROOT6_X