Merged in default (pull request #628)

Decrease Delay for XMPP File Transfers Using Streamhosts

Approved-by: Gary Kramlich