cons_tres gres topology fix

with some configurations and given a race condition test39.7 would
fail. This corrects some bad logic (failing to update CPU count when
cores are removed from consideration)