Merge "rdbms: IDatabase interface cleanups"