TEIID-3065, TEIID-3066: Fixed NPE, and implemented count(*) capability
Merge pull request #289 from rareddy/TEIID-3065

TEIID-3065, TEIID-3066: Fixed NPE, and implemented count(*) capability