Remove HLT customization
Merge pull request #983 from thspeer/SLHCCustom_7

SLHC -- Remove HLT customization