Merge branch '7.4.0' into '7.4.0'

updating CRMEntity.php to improve merging duplicates

updating CRMEntity.php to change transferRelatedRecords() function to deal with new related fields and custom modules
fixes #1577

See merge request !799