Merge "rdbms: Replace reportConnectionError() with direct throws"