Added number of databases for server component
Fixed ZEN-9282 issue
Merge remote-tracking branch 'upstream/develop' into develop
Merge pull request #41 from ssirushchyshyn/develop

Fix for ZEN-9282