Merged hltTemplatesForRun2In710 from repository perrotta
A few renaming in order to comply with the modified tracking templates...