Another one
Merge branch 'master' of github.com:cms-sw/hlt-confdb