Fix ODBC tests for get_affected_rows case
Add ODBC include dir from Windows SKD v7.0A
Merge remote-tracking branch 'upstream/master'