trq-2274 had to make several changes to change server name from <name> to <name>[:<port number>]
Merge branch '4.2-dev' of https://github.com/adaptivecomputing/torque into 4.2-dev