Merged refs/pull/6877/head from repository cms-sw
Fix HLTPrescaler label