Fixed conflicts that arose after cherry-picking fix for CA-98944

Signed-off-by: Vincent Bernardoff <vincent.bernardoff@citrix.com>
Removed tests that are not in clearwater

Signed-off-by: Vincent Bernardoff <vincent.bernardoff@citrix.com>
Fix compilation

Signed-off-by: Vincent Bernardoff <vincent.bernardoff@citrix.com>
Merge pull request #1196 from vbmithr/CA-98944-for-clearwater

Fixed conflicts that arose after cherry-picking fix for CA-98944