Merge "rdbms: Group disconnect/reconnect errors by DB server name"