TEIID-3025 correcting subquery in order by handling
TEIID-3024 correcting local synch timeout and make the timeout exception
better
Conflicts:

	runtime/src/test/java/org/teiid/runtime/TestEmbeddedServer.java