CDbConnection ODBC related fixes before merging