RED-36592 Added timeouts back to the semaphores in case we find that Fin...

...der is too unstable