Merge "rdbms: In the query log, show the server name in the message"