CRM-9744, CRM-12531
Merge pull request #1186 from yashodha/softcredit

CRM-9744, CRM-12531