Fix bug in step layout with nodelist

Fix bug in layout of job step with --nodelist option plus node count. Old
code could allocate too few nodes by double counting some nodes.