TEIID-2934 TEIID-2935 improving odata performance and ensuring the
correct inline count is returned