Fix more Centos5 compile issues.
Merge remote-tracking branch 'origin/slurm-14.03' into slurm-14.11

Conflicts:
	src/plugins/task/cray/task_cray.c
Merge remote-tracking branch 'origin/slurm-14.11'