Merge "rdbms: clean up and simplify toString() handle for Database"