Fix HipChat Server
Merge pull request #8513 from dblessing/fix_hipchat

Fix HipChat Server