HLT update using most-recent ConfDB templates
Merged refs/pull/6700/head from repository cms-sw
Sync subtables with updated master bis