Use count rather than total
Merge branch 'refs/heads/2.3/develop' into 3.0/develop

Conflicts:
	system/cms/modules/streams_core/src/Pyro/Module/Streams_core/EntryUi.php
Apply filters to count aggregate
Merge branch 'refs/heads/2.3/develop' into 3.0/develop