Fixes to compile XtConnect on v0.3.93

REVIEW: 110844
BUG: 320785
Merge branch 'fix-xtconnect-build'