Merge pull request #54 from teiid/master

Backporting PR 52 and 53 to support logging workspace
Merge pull request #55 from teiid/2.0.x

Merge pull request #54 from teiid/master