TEIID-2863: Steve's modifications
Merge pull request #201 from rareddy/TEIID-2863

TEIID-2863: Steve's modifications