Cosmetic changes for better clarity
Honor partition priorities over job priorities.

Previously partition priority was only considered when used as a
component of a job's priority with the priority/multifactor plugin.
Now the partition priority is considered first, as documented,
and the job priority is considered second.
bug 764
Merge branch 'slurm-14.03'