Revert the change made for TRQ-1961. This change made it so that I couldn't get my server to listen for connections.
Merge branch 'master' of https://github.com/adaptivecomputing/torque
Fix an error with a merge.