CLC-2600 Torquebox messaging tweaks

https://jira.media.berkeley.edu/jira/browse/CLC-2600