Patches to compile against CMSSW_7X

Tested on 7_1_5.