Fix forward port

This includes minor fixes already in CMSSW_7_2_X into CMSSW_7_3_X. @davidlange6 It does not include HLT updates by @Martin-Grunewald