IPMI - Fix first poll to get correct consumed_energy for a step.
Merge remote-tracking branch 'origin/slurm-2.6'