Merged CMSSW_7_1_X from repository cms-sw
Merged TkSeeding from repository VinInn
hack to allow test of HLT w/o bothering Martin