Remove vestigial variable
Merge remote-tracking branch 'origin/slurm-14.03'

Conflicts:
	src/plugins/task/cray/task_cray.c