Fix some scaffolding files.

Conflicts:

	src/server/test/exiting_jobs/scaffolding.c
	src/server/test/job_container/scaffolding.c
	src/server/test/job_func/scaffolding.c
	src/server/test/job_recov/scaffolding.c
	src/server/test/req_jobobit/scaffolding.c
	src/server/test/req_quejob/scaffolding.c
	src/server/test/track_alps_reservations/scaffolding.c