Fix for countDocument regression#1711

maheshrajamani wants to merge 3 commits intomainstargate/data-api:mainfrom

count-bug-fixstargate/data-api:count-bug-fixCopy head branch name to clipboard