Merged refs/pull/4444/head from repository cms-sw
Adapt to CondDB V2 (due to PR #4295)