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

Fix findAndCountAll with include all