Merge pull request #54 from teiid/master

Backporting PR 52 and 53 to support logging workspace