Fix compilation broken due to change in xmpp-server api and because
ifmap_xmpp_test is in flaky list.

Change-Id: I1f9cc3ad41dd4019aa006bae675e2cf3e34415a9
Merge "Fix compilation broken due to change in xmpp-server api and because ifmap_xmpp_test is in flaky list."