Merge pull request #5964 from monishdeb/CRM-16574_Contribution_Summary_Report_grouping