Fix issue where user is requesting --acctg-freq=0 and no memory limits.
Merge remote-tracking branch 'origin/slurm-2.6' into slurm-14.03

Conflicts:
	src/slurmd/slurmstepd/slurmstepd_job.c