Gres fix for requeued jobs.
Gres accounting - Fix regression in 2.5.5 for keeping track of gres
requested and allocated.
Tag for 2.5.6
Merge remote-tracking branch 'origin/slurm-2.5'

Conflicts:
	META