CRM-13051 pledge detail report provides inaccurate totals

Conflicts:

	packages
CRM-13275 Pledge detail report not showing paid amount for cancelled,
also fixed up totals
Conflicts:

	packages
CRM-13275 fix stats to show total count by currency & grand total

Conflicts:

	packages
Merge pull request #1487 from eileenmcnaughton/CRM-13275

CRM-13275 fixes on pledge report ported from 4.2