dev/core#1934 fix regression on merging contacts with settings using contact_id

[eileenmcnaughton]

Overview

This is an interim fix to a reported regression. I'll look at more carefully in master when time permits

Before

Attempting to dedupe 2 contacts with settings with contact IDs will cause a fatal. My understanding is this would only be the case if an extension implemented it

After

Dedupe works

Technical Details

Comments

[civibot]

(Standard links)

• If this is your first pull-request for CiviCRM, please browse CONTRIBUTING.md for information about the development and testing processes.
• If you are reviewing this pull-request, you may wish to consult the test sites and the Review Standards (long template, short template).

[seamuslee001]

@eileenmcnaughton I think there is an activity related setting that is a per contact thing but yes this seems correct to me