updates for [TRAFODION-1492] - address review comments.
updates for [TRAFODION-1492] - address review comments.

mashengchen/incubator-trafodion,robertamarton/incubator-trafodion,rlugojr/incubator-trafodion,mashengchen/incubator-trafodion,rlugojr/incubator-trafodion,robertamarton/incubator-trafodion,robertamarton/incubator-trafodion,mashengchen/incubator-trafodion,rlugojr/incubator-trafodion,mashengchen/incubator-trafodion,robertamarton/incubator-trafodion,rlugojr/incubator-trafodion,rlugojr/incubator-trafodion,rlugojr/incubator-trafodion,mashengchen/incubator-trafodion,rlugojr/incubator-trafodion,mashengchen/incubator-trafodion,rlugojr/incubator-trafodion,robertamarton/incubator-trafodion,robertamarton/incubator-trafodion,rlugojr/incubator-trafodion,rlugojr/incubator-trafodion,mashengchen/incubator-trafodion,mashengchen/incubator-trafodion,robertamarton/incubator-trafodion,robertamarton/incubator-trafodion,mashengchen/incubator-trafodion,mashengchen/incubator-trafodion,robertamarton/incubator-trafodion,robertamarton/incubator-trafodion