Fix bugs in step allocations in heterogeneous env

Former logic failed to properly allocate resources to a job step
when specifying both a task count and a node count range on a
heterogeneous cluster.