Merge "Replace mocks of DatabaseMysql by DatabaseMysqli"