Merge "rdbms: clean up session/transaction loss logic in Database"