Merge pull request #14773 from eric-chahin/null_relation_fix

Changed the NullRelation so that when count is called with #group it wil...
Conflicts:
	activerecord/CHANGELOG.md