Merged in default (pull request #639)

Re-write jabber util tests to be subtest-ish

Approved-by: Gary Kramlich
Approved-by: John Bailey