Update code to allow support for xmpp-ftw-buddycloud
0.6.1