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

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