CRM-18455: Don't corrupt address type on 'safe' merge