Merge "Enable TLS for XMPP bus"