Fixed detection of db instance

Change-Id: If5c55281e899b6e8f0740bacb9c7b50e53807674
Merge branch 'hotfix/replset'