CRAY - Fix srun --mem_bind=local option with launch/aprun.
Corrected buffer size computation in the pmi2_api.c module.
Merge remote-tracking branch 'origin/slurm-2.6'

Conflicts:
	NEWS