Fix another set of test failures caused by galera merge.