Update to test to work correctly when dealing with systems that have
other config files like bluegene.conf and such.
Merge remote-tracking branch 'origin/slurm-14.11'