CLC-3198 Torquebox 3.1.1 upgrade
Merge pull request #2704 from ctweney/clc-3198

CLC-3198 Torquebox 3.1.1 upgrade