CRM-12974, currency formatting fixes