#781 Additional email greetings in message templates

#1126 - Don't freeze the end date if the membership is linked to a recurring payment

5.19 to master

Regression fix on Paypal Std with memberships not being finalised correctly.

fix 'balance due' on Pledge Detail for non-US installs

[REF] Rename balanceTrxnParams variable to paymentTrxnParams 

Per https://github.com/civicrm/civicrm-core/pull/15053#issuecomment-542770130

This array needs some fixes but I wanted to rename the parameter first as balanceTrxnParams is misleading.

The parameters are for the financial_trxn entry corresponding to the payment

Simplify logic for displaying card details for Event online registraion Confirm, Thankyou page

Fix logic determining whether (masked) credit card details are displayed in event online receipts

We currently have a very complex IF clause which includes some deprecated parameters.

However, we can simplify this to simply display the information if availble. We only collect
credit card information if we require it & hence the presence of it is an adequate indicator
as to whether to display it.

We could check for credit_card_number instead but actually there is precedent in another tpl
for checking credit_card_type & it's pretty neutral as both should be present or missing

Remove extraneous full stop, line

Add test for participant receipts, super minor consistency fix.

I noticed in testing the template looks like

Dear p,  Thank you for your participation.  This letter is a confirmation that your registration has been received and your status has been updated to Registered.  .

===========================================================
Event Information and Location
===========================================================
Annual CiviCRM meet

This is mostly adding testing for participant receipts. The one change to core code is to move the assignment
of contactID to the template from a specific path into the shared code. This parameter is not required by
the templates but it is somewhat common for sites to want to have it assigned to templates for
customisation which is presumably why it's there. Since it is there in one path we should either remove or
have it in all & for a field like contactID all makes sense. Tests lock in that var

5.19

Fix default mode on Contact.merge api

5.19.0 release notes initial run

5.19 to master

I believe this was a change I made in error & only the Contact.get_merge_conflicts api should
receive an array for 'mode'. The mode is part of a loop within that api

5 18 3 release notes

Format details for case custom data activity in a human readable format

Fix error when adding activities from Search Builder

[NFC] #1046 - minor consistency change

Remove references to open flash chart, including uploadchartimage fun…

regen sql/civicrm_generated.mysql

[REF] minor extraction with code to build dedupe arrays

[REF] basic extraction of sendMails functionality along with a small test extension

#1230 [Ref] Rationalise dedupe code loop.