Fix some problems in different unit tests.
TRQ-1925. Make it so that TORQUE will detect if it isn't reserving enough memory nodes for the job's request and reserve additional memory nodes if needed.
resolve a merge conflict.