teiiddes-1808: Fixed NPE and added teiid dependency in manifest.
Merge pull request #289 from tejones/teiiddes-1808

teiiddes-1808: