TRQ-1639 gpus_str and gpustatus got reversed between nodeattr and node_attr_def
Merge branch '4.1-dev' of https://github.com/adaptivecomputing/torque into 4.1-dev