[TRAFODION-2004][TRAFODION-1775] Two follow-on fixes
[TRAFODION-2004][TRAFODION-1775] Two follow-on fixes

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