Fixes the HipChatAgent
Merge branch 'hipchat-agent-fix' into testing