Patches to compile against CMSSW_7X