Fix matchmaker bug

It's ok if process is no longer in queue. Consolidate this code
in matchmaker.

Fixes OOIION-844
Speed up some PD tests

The final waits for RUNNING in the restart_mode tests aren't
really necessary because restarted processes never actually
hit EXITED/FAILED, they go directly to DIED_REQUESTED