Fixes for SLURM 2.6, still non functional but closer.