update XMPPFramework master branch for Frosty

@pmurphyjam please take a look at this and ensure that the commits contained in this PR is correct. I'll still need to rebase the changes from the xmpp-medigram-hack branch onto this one (for disabling of SRV lookups), but we'll start with this PR.