Minor changes in FakeDatabase. Ported code from DBUtil to our original
DatabaseUtil to limit the amount of changes that would be made to RPC
calls.