help to merge TRAFODION-1743

[Ma, Sheng-Chen (Aven)]

Hi all:

this jira had been merged in 
#561<https://github.com/apache/incubator-trafodion/pull/561>, but it is strange 
the changed code disappeared in apache/master. So I do a PR again.
Can someone help to merge again.


Thanks
Aven