Fixed bad merge problem from the 4.2-dev branch for trq-1437.
Merge branch '4.1-dev' of https://github.com/adaptivecomputing/torque into 4.1-dev

Conflicts:
	src/server/process_alps_status.c
Fixed a bad merge from the 4.2-dev branch for trq-1437.