Add similar logic to salloc as sbatch that was done in commit c396ac202.
Merge remote-tracking branch 'origin/slurm-14.03'

Conflicts:
	src/salloc/opt.c