CRM-12970, fixes to setdefaults discount fees