DS-1490:  merge db.xml changes
DS-1490:  removed search service