Patches to move xmpp to another file, and introduce xmpp timeouts.

Timeouts for polling retries if xmpp working and not working.
Update 10-4 changelog entry with changes to date.