DSVC-143 Changed db.properties to bdes-db.properties
Merge remote-tracking branch 'origin/master'