Merge "Refactor tls certs for xmpp"