Merge invirt-database-server into invirt-database.
I...think this works, but I'm not making any promises.