manual merge of fixes for CRM-13981

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

fixes for CRM-13981