Temporary fix for xmpp server introspect on agent

Change-Id: I35bcb23674d27846eaddd6db9b699c3f88bc100f
Merge "Temporary fix for xmpp server introspect on agent"