small fixes for XMPP merge and applied patch
https://dev.guardianproject.info/issues/3038#change-7453