TRQ-2168 - fix "make distcheck" build problem

Conflicts:

	src/lib/Libutils/test/u_putenv/test_u_putenv.c
Merge branch 'master' of https://github.com/adaptivecomputing/torque