7.x 4.x 1076 upsell tokens

This change request allows for sitewide tokens in upsell confirmation and email messages.