Fix variable name typo in test
change xmalloc to malloc in make patch
Merge branch 'slurm-14.03'