Changes for ucs2 cleanup in JDBC_T4 driver

Change-Id: I88f65d78838d3ce2aa017f1e05adfe59bfe5a7e5
Merge "Changes for ucs2 cleanup in JDBC_T4 driver"