Fix for mixing core base reservations with whole node based reservations

to avoid overlapping erroneously.

Before you could get overlapping reservations if you asked for a core
based reservation and then a whole node reservation.  This fixes that.