CLC-2055 tweaks

Final adjustments to make torquebox clustering work in production machines. 

JIRA: https://jira.media.berkeley.edu/jira/browse/CLC-2055