TRQ-2280. In the event that pbs_server re-writes the nodes file have it save additional properties added to the cray compute nodes in the file as well instead of forgetting them.
Merge branch '4.2-dev' of https://github.com/adaptivecomputing/torque into 4.2-dev