Partitial reversal of commit 16143b0f
bug 403

Additional work for 6f50943c
This fixes some more GRES allocation test cases

Split lines more than 80 characters into multiple lines

Conflicts:
	src/slurmd/slurmstepd/mgr.c

Previously would reference NULL pointer
bug 403

Change trigger_state_restore() return type from int to void.
This eliminates some CLANG errors
bug 403

As reported by CLANG
bug 403

Fix problem reported by CLANG
bug 403

bug 403

Should not be possible, but prevent CLANG error
bug 403

Reported by CLANG, but not possible in practice
bug 403

Should not be possible, but this prevents CLANG error
bug 403

Should not be possible, but fixes CLANG bug report
bug 403

buf 403

bug 403

bug 403

Not likely, but fixed problem reported by CLANG tool
bug 403

bug 403

script.

For a system with hyperthreads and GRES bound to specific CPUs,
there was an error in assigning CPUs

Previous logic would allocate job resources on such a node
rather than reject the job allocation on that node.

Previous logic would pick CPUs then
reject jobs that can not match GRES to the allocated CPUs. New logic first
filters out CPUs that can not use the GRES, next picks CPUs for the job,
and finally picks the GRES that best match those CPUs.
bug 410

No change in logic, just rename a variable for greater clarity