Add test to insure gres/mps and gres/gpu don't overlap

Make sure that a job using gres/mps and gres/gpu on the same
node either run at different times or use different GPUs.
This restores part of test40.2 that was bad and removed in
commit 5a6409bb. It also insures that the logic added in
commit ac1182cf works as desired.