CRM-13981 additional fixes

----------------------------------------
* CRM-13981: Migrate "In Honor of" to Soft Credits
  http://issues.civicrm.org/jira/browse/CRM-13981
Merge pull request #2417 from monishdeb/CRM-13981

CRM-13981 additional fixes