TEIID-2933 fix for skip token
TEIID-2934 TEIID-2935 improving odata performance and ensuring the
correct inline count is returned
Merge branch '8.7.x'