KAZOO-2136 tweaks and xmpp timeouts