CA-83270: fix incompatible changes with XOP-229.

Signed-off-by: Jerome Maloberti <jerome.maloberti@citrix.com>
Merge pull request #130 from jeromemaloberti/CA-83270-bis

CA-83270: fix incompatible changes with XOP-229.