Fix for error message - relevant for the double dropbox
Merge pull request #3673 from ggovi/new-conddb-fix-1

DB -- Fix for error message - relevant for the double dropbox
Merge remote branch 'origin/CMSSW_7_1_X' into CMSSW_7_0_X