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

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