XMPP

Various changes required by the XMPP branches in backend and client.