Clear QOS GrpUsedCPUs when resetting raw usage if QOS is not using any cpus.
Change QOS name in test
Remove log message left from debugging.
Minor typo fix
When using CR_PACK_NODES fix make --ntasks-per-node work correctly.
Merge remote-tracking branch 'origin/slurm-14.03'

Conflicts:
	testsuite/expect/test21.30