Don't wait for the lock if someone is already waiting for it

Merged Alex Iribarren requested to merge wait into master

Merge request reports