LP#1703411: Move OpenSRF XMPP attrs to subelement