These changes partially address bug 326

Our tester complained that srun --usage displays --profile=all
rather than --profile=all|none|energy|lustre|network|task.
None of the other options on usage have their possible options
displayed so I made  usage display --profile=... to be similar
Then I enhanced --help to list the possible values.
I also made the change to salloc and sbatch.
bug 325

overwritten by the parallel versions thus making it so we need handle
both cases.

we've been unable to submit jobs that request one task-per-core
when we have SMT enabled (but it would work successfully for
jobs that wanted two tasks-per-core).
I ended up tracking it down to a regression caused by commit
8127554a.
See bug 322

Thanks for the feedback! I was actually planning contributing a more complete set of documentation for the SLURM web pages but have been super busy.
Feel free to copy the current documentation. I'll try to refine it a bit next week.
It might be better to leave the link out as we might move the documentation to the "proper" CSC website at some point.

Since we don't currently track energy usage per task (only per step).
Otherwise we get double the energy.

Conflicts:
	NEWS

the user specifies a polling frequency larger than the default
(Meaning the enforcement would happen at perhaps a much slower pace)
then deny the job.

Conflicts:
	META
	NEWS
	src/plugins/priority/multifactor2/priority_multifactor2.c

Andy Wettstein (University of Chicago) reported privately to me that slurmctld
2.5.4 crashed after he enabled the priority/multifactor2 plugin due to a
division by zero error.

I was able to reproduce the crash by creating an account hierarchy where all
the accounts and users had zero shares.
See bug 315

Revert premature change of META

Without this change, it appears that POE ignores the -procs argument
resulting in a job step request with multiple host names, but only
one ntask required