Merge "rdbms: cleanup some Database error message wording for consistency"