Remove redundant variables
Properly handle job requeue options

Properly enforce job --requeue and --norequeue options. Previous
logic was in three places not doing so (either ignoring the value,
ANDing it with the JobRequeue configuration option or using the
JobRequeue configuration option by itself).
bug 821