ConfDB template 710pre7 and misc. HLT_DQM fix
Merged refs/pull/3588/head from repository cms-sw
Fix of Fix
Merge pull request #3588 from Martin-Grunewald/Template710pre7

HLT -- ConfDB template 710pre7 and misc. HLT_DQM fix