[DDC-1666] Fix bug where orphan removal on one-to-one associations lead to unique constraint errors when replacing an entity with a new one.
Merge branch 'DDC-1666' into 2.3