Follow on to 4d7df8b0

If a slurm.conf only has gpu but the gres.conf has gpu:gtx or any other
type we want to remove the type from the gres.conf and use that instead
of forcing the admin to remove the type from the gres.conf.

Bug 7517

Signed-off-by: Michael Hinton <hinton@schedmd.com>