Restore gres functionality with select/linear

Logic introdiced in version 14.03.10 to support requeueing of jobs
with GRES allocated to currently running steps broke select/linear
due to differernces in the plugin logic. The commit with the bad
logic is 1209a664