Bug 2024 bonjour broken

almost done with this... mostly LLXmpp related but some other small changes that reared their head during this work