Merged refs/pull/6237/head from repository cms-sw
Integrate 155 in master, 163 in master+GRun; add 132 and 152 to GRun
Merge pull request #6251 from perrotta/hltIntegrationsAfternoon141106

Hlt integrations afternoon 141106
Merge remote branch 'origin/CMSSW_7_3_X' into CMSSW_7_0_X