#2006 set short keepalive interval for XMPP
Merge branch 'hotfix-1.5.14'