Fix findAndCountAll with include all
Merge pull request #2662 from overlookmotel/fix-count-include-all

Fix findAndCountAll with include all
Merge remote-tracking branch 'upstream/master'
Revert "Fix findAndCountAll with include all"

This reverts commit e1b735cc4d586dc62bcda67e0a98566a32e0ea52.
Revert "Revert "Fix findAndCountAll with include all""

This reverts commit 0bd7a4ca564eb89b56e8a017869b595f80774841.