Merge [TRAFODION-3222] PR 1727 Fix Windows ODBC build on release2.3 branch