teiid/teiid — pull request #365 by vhalbert (2014-11-24 19:02:14+00:00)
Title: TEIID-3233  Fixed NPE in test integration

This can also be applied to master.