CRM-13551

Fix for both the points mentioned in issue.

Also includes a code improvement which consists of removal of old column <code>source_contact_id</code> dao code(dropped in 4.4) and replacing it with proper value.