Porting TESTTOK2 to trafodion

Change-Id: Ib1bd3a1f5d612cf6a5c718b733edf503cb095852
Merge "Porting TESTTOK2 to trafodion"