TEIID-2467 removing thread waits and refactoring references to the
workitem