Bug 1336641:ODBC endurance connect test fails with utf16

Change-Id: Ie1c4ffeeae3b1d2461111486644a46b2e496c4e4
Merge "Bug 1336641:ODBC endurance connect test fails with utf16"