CRM-21026 fix issue with ContributionCount not including disabled financialtypes