Fixed token insert on Preference Address Page
Merge pull request #4404 from eileenmcnaughton/CRM-14433

CRM-14433 Fixed token insert on Preference Address Page
Merge pull request #4403 from eileenmcnaughton/4.4

CRM-14930 fix net_amount on authorize.net
Fix for CRM-15487