TRQ-1660. nppn wasn't being passed to alps reservations because a parameter was being mixed up in the alps request. mppwidth and use_nppn were getting switched, so things weren't working.
Merge branch '4.1-dev' of https://github.com/adaptivecomputing/torque into 4.1-dev