Fix typo in log message
Fix division by zero issue when get_cpuinfo returns 0 for number of sockets.
Revert "Fix division by zero issue when get_cpuinfo returns 0 for number of sockets."

This reverts commit b22268d8160cc68914f7bdf97b814bdf991c2853.
Correct author
fix --ntasks-per-socket with --cpus-per-task

Previous logic was counting CPUs, but assuming each task would
only use one CPU.
Pack cpus-per-task onto single socket

cpus-per-task support: Try to pack all CPUs of each tasks onto one socket.
Previous logic could spread the tasks CPUs across multiple sockets.
honor cpus_per_task with ntasks_per_core

Previous logic assumed cpus_per_task=1, so ntasks_per_core option
could spread the job across more cores than desired
Merge branch 'slurm-14.03'