pull in TRAFODION-3336
3 files changed