More updates
Merge pull request #1798 from Martin-Grunewald/FixHLTvsRECO2

HLT fixes -- More updates/fix for HLT vs RECO