Merge invirt-database-server into invirt-database.