Merge "rdbms: improve database connection loss handling"