Merge "Add xmpp tls parameters"