Correction to v2.2 merge for node power up

This is a correction to the merge of slurm-2.2 logic into the v2.3 head.
In insures that nodes being powered up when slurmctld restarts are
returned to service properly.