Fix merge conflicts/build errors

Merge conflicts from CMSSW_7_3_X are causing build errors.  This pull request fixes the merge conflicts.
Please merge in time for the CMSSW_7_3_ROOT6_X_2014-10-07-0200 IB if at all possible.