svn merge -r19838:19859 https://eris.llnl.gov/svn/slurm/branches/slurm-2.2.step.max.nodes

 -- Add support for maximum node count in job step request.
 -- Fix bug in CPU count logic for job step allocation (used count of CPUS per
    node rather than CPUs allocated to the job).