CLC-2600 (QA) Torquebox messaging tweaks

QA branch version of #1630

https://jira.media.berkeley.edu/jira/browse/CLC-2600