Cancelled Total Missing from Contact Contribution Totals Table

If there are Cancelled Contributions for a contact, the Total for Cancelled Contribs should be displayed above the listing of contributions in the contact's Contributions tab. However, they are missing.

To recreate:

• Go to a contact record, contributions tab
• Enter an offline contribution
• Edit the contribution and cancel it
• Check the Totals section - no cancel total

CRM/Contribute/Page/ContributionTotals.tpl is expecting $contributionSummary.cancel.amount to have a value.

Also, the HTML in that tpl needs some restructuring. Currently, you get an empty table (with just a few th cells which show up as under lines on the screen under some conditions.