fix to address review comments. NADELETE used where needed.
fix to address review comments. NADELETE used where needed.

mashengchen/incubator-trafodion,mashengchen/incubator-trafodion,mashengchen/incubator-trafodion,mashengchen/incubator-trafodion,mashengchen/incubator-trafodion,mashengchen/incubator-trafodion,mashengchen/incubator-trafodion,mashengchen/incubator-trafodion,mashengchen/incubator-trafodion,mashengchen/incubator-trafodion