CLEARWATER: Merge pull request #1062 from vbmithr/CA-87377

CA-87377

Cherry-picked from 96e17156e1c7688f8ece253a2de104c2c2b5d726 with parent 5addae7

Clearwater needs this set of changes first so that we can apply cleanly the changes made in master for CA-105155 for SCTX-1334.