better fix for commit e18c3d9feff
Merge remote-tracking branch 'origin/slurm-14.03'

Conflicts:
	src/common/read_config.c