Merge pull request #1860 from selvaganesang/t2_driver_cleanup_1

[TRAFODION-3329] Code cleanup in Type 2 driver