revert back to CondDB v1
Merge pull request #4646 from davidlange6/revert_CondDB

revert back to CondDB v1