Fully merge slurm.conf and gres.conf before node_config_load().

Before, data from slurm.conf was only partially merged if there was
no corresponding entry in gres.conf.
Now, Slurm tries to match up gres.conf records to what is defined in
slurm.conf.

Bug 7517