Merged in bonjour-rename-xmpp (pull request #610)

Rename Jabber to XMPP in Bonjour

Approved-by: Elliott Sales de Andrade
Approved-by: Gary Kramlich
Approved-by: Eion Robb